WIP: flake8 fixes.