A few more PEP8 fixes.