Pylint fixes to make @mmaker happy