Necessary cleanup for warning-free work with 2.6

Note this implies a semantic change, as previously the interval
was divided into 2^subsampling intervals. Now the explicit number
of intervals is set.