More whitespace cleanup

Follow up to
Ic3eaf12659a502c68c0756519891c99f85a7b4fd

Change-Id: If9e1c878d75a68616d243abbf659fbc77d585f5e