Bring code in line with the common style of the project

(if you diff with 'Ignore space change',
 the real changes are actually quite small)