Follow up to r1847232. There is no point to use "old" numbers in recent commit. Also avoid number duplication. The messages are the same but in different code path, so having different numbers makes sense. This also avoids a warning when running: make update-log-msg-tags