More PEP8 cleanup.