Lazily fix aliasing

Change-Id: I96d44cb304150d92e9495c5cff227386abb4ecb1