Agree that we should migrate away from this - I've added comments to make it clear that these are deprecated.  However, I suspect we'll be stuck with this for at least a few months as the upgrade hit to customers is quite large.