Fix some more flake8 errors.