Fixed flake8 warnings introduced in recent commits.