Eliminate some unnecessary abstraction.