Fix aliasing violations (properly)

Change-Id: I42fee1dfaa0fc0b67145f7f0e2bc2ac16914e1d4