org-macro: Fix macro expansion in commented trees