fixup! Fix more flake8 issues.