merge whitespace tweaks from gcc