I have backed out the "args" -> "_args" change.  Not because I'm giving up on it, or that I necessarily think it's a bad idea, but because there
are some changes happening in #20189 that will make it easier / that would conflict if I attacked it now.

The resulting patch is smaller than the first iteration.  And since you said it was fine except for that, I assume this patch is fine and can go in?