cleanup macros for AST