Tweaks to make 'pylint' happier