core: get rid of some unnecessary wrappers.