I see.  I didn't get this from our chat, sorry.  Maybe it was too late for me; I barely have any recollection at all!

The reason I resist is that this will cause merge conflict pain (oh, you can't imagine :)).  But now I understand the need for it here.  Thanks for the info!