More cleanup to eliminate not-completely-necessary Pylint warnings