Please don't bloat all my comments just because you are changing things in the same file.  If this is how we are going to do it I'll open a PR to remove them all and have just as much justification.