Further tweaks for pylint.