I don't have the time to do that sort of work now, so I think we're going to have to accept the deprecation warnings (or pragma them away).