Renamed metavariables as per our discussion today.
Fix-ups.
Reserved \Delta for diagrams (else \diag\Gamma for diagram contexts).