Merged delMacroArgument into delMacro and delMacroNameAndContent