Tweaks so we can drop the 2to3 xrange fixer