Additional PEP8 changes.