2to3 changes in setup and core files (no binutils)