Ran 2to3 and a few manual fixes.