Remove two layers of indirection