Whitespace changes to minimise diff wrt original changes