More tweaks to pylint output