Lazily fix aliasing

Change-Id: I9a33b7692a968190e77966ef5a438c3afc034545