Minor clean ups

Fixing some minor issues found with pylint.  I've done them in separate commits in case you don't want all ofg the fixes.  Feel free to squash if necessary.

Right.  I'll look into whether it's covered by the tests.

Speaking of which, I haven't seen any CI job get kicked off for this PR.  Is it working?