Fix lint issues caught by new pylint version.