Apply suggestions from code review

The commited suggestions will restore compatibility with Python 3.6.

Co-authored-by: Christian Clauss <cclauss@me.com>
2 files changed