Fix overlapping spans in removing extra arguments #108239
+76
−39
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.