This PR fixes two code style issues that are only exposed with (the newly released) flake8 >=3.8.0.
flake8 >=3.8.0