Improve the 'pylint disable' statements