Changed macros to include special forms
*** empty log message ***