Squash more Pylint warnings