Clean up some more flake8 issues.