Various unrelated code quality enhancements and fixes with no effect on execution.
py2compat
18 months ago, Edouard Tisserant