Remove an extra layer of indirection