[squash] remove one level of indirection