Flake8 cleanup.

Codereview fixes for f047be9