Some small changes.
Macro is correct now.
Added shorthands for AST.