Remove level of indirection