Some cleanup & re-enabling some strict aliasing

Change-Id: I83ccaaddf77393f7d4e0f52ace97790a2e7cdf5f