Corrected white-space handling.

Change-Id: I01cd030c27e169c7833a6a90821b69c04bdfc272