Make inline "pylint: disable=" notes more clear

Switch ambiguous statements such as "pylint: disable=W0621" with clearer disable statements such as "pylint: disable=redefined-outer-name". I propose that we should be using the clearer form throughout the codebase, so code reviewers know what's going on and coders don't blindly carry over disable statements that no longer apply.