started to check how we can improve handling of nested macros