Minor change
Replaced DefMacro with DefMacroI