Macro parser: work in progress