WIP: fixup some 2to3 PEP8 issues