Minor tweaks to finish converting from the bool var should_deinterleave to the integer interleave_levels.