Still more cleanup to PEP8.