Death to white space.

Change-Id: Ic8d10fb7d238aa8b9cff04ac22aabacc87272f63