Fix minor issues signaled by flake8

The invocation used to target fixes was:

    flake8 --ignore E501,E122