Lazily fix aliasing

Change-Id: I382ebd363e4897226e4281cde63ec773b01d520c