Fixed some flake8 errors from recent commits.