Lazily fix aliasing

Change-Id: I1affa40e43e7e33bfeb92d2a24e60639720f4677