pep8/pyflakes fixes. (@justinvdm)