The dangers of whitespace

Some say in whitespace, the entire universe can hear you scream

Change-Id: Id1c104f24fd5b6097a7c3548bb1dad74f568ea5c
Lazily fix aliasing

Change-Id: I2300aa80933364af70d7fb502699b725eec3383c
Moar aliasing lazy fixes

Change-Id: Id4290c647fa5c3a30c689af48e9e226e3cd547d0