(rescan): Expand `#if foo && #bar' without a bogus complaint about preprocessor directives within macro args.

(rescan): Expand `#if foo && #bar' without a bogus complaint about preprocessor
directives within macro args.
Expand `foo' in `foo#bar' without requiring a space before `#'.

From-SVN: r10412