Further pylint cleanups.