Cleaning up the new rename-comments/strings code.

Mohamed rightly pointed out we were triplicating work and we could just roll
the new checks into the existing tree walking code.