Improved handling of Select and TypeApply in DiagrammedExprMacro.