Fix macro processing by stripping macros very early
Authored by: Rick Copeland 2010-06-11
Parent(s): [355f71]
Child(ren): [1c3c54]