Whitespace tweaks to remove differences from trunk