Yet more pylint fixes.