More pylint changes...