Just inline all of these? As-is this code is less readable, less maintainable and suggests we should un-deprecate the old APIs.