Fix up some pylint complainery