I actually like how this is implemented currently. If I wrapped it, I would have to do that farther from the function that's deprecated (given the current style of this file, at least).