Extend residue2 setup code to work with non-stereo bundles