A little code clean-up in DiagrammedExprMacro.