Assorted pep8/pyflakes fixery