(rescan): Preserve newlines after macro names at the top level since
this is more likely to do the right thing with line numbers.

From-SVN: r8287