Pyflakes was unhappy because I touched files with some warnings, so I made the changes it suggested.