Changed to use Eugene Burmako's paramss method in DiagrammedExprMacro.