Add in old fns to avoid breakage in plugins.

Also tag them as deprecated. (Since I was a bit too eager on this one,
feel free to revert to before the merge if the changes aren't worth it.)