Even more Pylint fixes...