The edit comment is just a distraction. It/them/blah doesn't matter. Pick one. Stick with it. People will understand.

PS: Agree with the rest of your comment.