Secondary PEP8 cleanup.