Lazily fix aliasing

Change-Id: I3e2646eab377276d62f43407494903760c3fb83f