More pylint cleanup.