Scattered Refactorings

I'm doing these while I learn the codebase.
If it wouldn't trouble extension writers, it'd be nice to have the Python3 names imported by default.