Fixed DEFPSMACRO and DEFINE-PS-SYMBOL-MACRO

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

A gist to demonstrate the problem https://gist.github.com/pjstirling/9128143
The output should be ```right = alsoRight();```, and is with the patch.