Clean up a couple of pylint warnings, plenty left.