Spacing cleanups.

Change-Id: I0567eba8ff5205afb60d5fb7eebe1dd8a9c910e1