@mruzicka yes, I think including both would be ideal, thanks.  If you're feeling keen, it could be listed for removal in 4.x.