I modified a bunch of these functions to use a new call. As they weren't used internally I also removed the indirection.