More PEP8 compliance fixes.