Moved OwnerRepair duplicated in BooleanMacro and DiagrammedExprMacro out into its own MacroOwnerRepair.