Changes to keep pylint happy