Fix pylint violations from #2129