Hygiene: Whitespace fixes

Change-Id: I6037c930d17ba38febd3a133f1c35f84312a105b