These are totally unused now in our sources, and completely untested. Should we move to start deprecating these? If so, now is the time to do it of course.