Some more flake8 fixes.

Still not completely clean.