Improve conformance to PEP8, tidy up.

Just another (small) step, done in semi-auto mode using autopep8 + diff reviews.