Further Pylint changes.