Lazily fix aliasing

Change-Id: I89567c3723eaa36a0f41f335083a12d52e757b84