I think your comment is enough to poke us to sort this out at our leisure - don't let's delay this PR over this !
The situation was there before you touched the code, after all.