Further PEP8 fixes.