A few more pylint fixes.