fixed DEFPSMACRO and DEFINE-PS-SYMBOL-MACRO to ensure that any
macros defined with them will be expanded properly when needed in
the same file