More flake8 related fixes after a upgrade.