Some flake8 fixes.