Fix remainder of 2to3 warnings

Did not fix u'' prefix (now allowed)
Did not fix callable (now allowed)