added pre-processing of macros for outbound processing