(collect_expansion): Don't add whitespace at end if inside a string and not traditional.

(collect_expansion): Don't add whitespace at end if inside a string and not traditional.

(collect_expansion): Don't add whitespace at end
if inside a string and not traditional.
(rescan): At end of string, if inside macro, always keep scanning.

From-SVN: r2506