LP#1548869: tidy up whitespace