Bug fix: wrong variable scope.
Catch up with the latest pylint contortions.
Merge branch 'master' into preprocess