add arity-aware macro name resolution