org-export: Use new API for macro expansion