Cleaned up more pylint warnings.