flake8 fixes.
Fix some flake8 warnings.
Some more flake8 fixes.