Hmm, reading through the other comments on the other places in the PR where there are _ to get rid of W0612 warnings we'd either need to sprinkle pylint: disable's or make it ignore all of them. Again reinforcing the point that we might just rather consider dropping the PR.