Remove extra indirection