2to3 + import cleanup for Python3.