Remove unnecessary layer of indirection.