Additional PEP8 changes.

See code.