Initial 2to3 run on new codebase