Added CL style macro support and a few simple macros