Small mods to enable 2to3