diff --git a/cts/cli/regression.upgrade.exp b/cts/cli/regression.upgrade.exp
index 9262a81993..d2599f8ee2 100644
--- a/cts/cli/regression.upgrade.exp
+++ b/cts/cli/regression.upgrade.exp
@@ -1,129 +1,129 @@
 Created new pacemaker configuration
 Setting up shadow instance
 A new shadow instance was created.  To begin using it paste the following into your shell:
   CIB_shadow=cts-cli ; export CIB_shadow
 =#=#=#= Begin test: Set stonith-enabled=false =#=#=#=
 =#=#=#= Current cib after: Set stonith-enabled=false =#=#=#=
 <cib epoch="1" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
     <resources/>
     <constraints/>
   </configuration>
   <status/>
 </cib>
 =#=#=#= End test: Set stonith-enabled=false - OK (0) =#=#=#=
 * Passed: crm_attribute  - Set stonith-enabled=false
 =#=#=#= Begin test: Configure the initial resource =#=#=#=
 =#=#=#= Current cib after: Configure the initial resource =#=#=#=
 <cib epoch="2" num_updates="0" admin_epoch="0">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
     <resources>
       <primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
         <operations>
           <op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
           <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s">
             <instance_attributes id="mySmartFuse-inputpower-instanceparams">
               <nvpair id="mySmartFuse-inputpower-requires" name="requires" value="inputpower"/>
             </instance_attributes>
           </op>
           <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s">
             <instance_attributes id="mySmartFuse-outputpower-instanceparams">
               <nvpair id="mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
             </instance_attributes>
           </op>
         </operations>
         <instance_attributes id="mySmartFuse-params">
           <nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
         <!-- a bit hairy but valid -->
         <instance_attributes id-ref="mySmartFuse-outputpower-instanceparams"/>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status/>
 </cib>
 =#=#=#= End test: Configure the initial resource - OK (0) =#=#=#=
 * Passed: cibadmin       - Configure the initial resource
 =#=#=#= Begin test: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
-Resources-operation instance_attributes: mySmartFuse-monitor-inputpower (rsc=mySmartFuse, meta=mySmartFuse-inputpower-instanceparams): dropping requires
-Resources-operation instance_attributes: ... only start/promote operation taken into account
-Resources-operation instance_attributes: mySmartFuse-monitor-outputpower (rsc=mySmartFuse, meta=mySmartFuse-outputpower-instanceparams): dropping requires
-Resources-operation instance_attributes: ... only start/promote operation taken into account
-instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
+INFO: Resources-operation instance_attributes: mySmartFuse-monitor-inputpower (rsc=mySmartFuse, meta=mySmartFuse-inputpower-instanceparams): dropping requires
+INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
+INFO: Resources-operation instance_attributes: mySmartFuse-monitor-outputpower (rsc=mySmartFuse, meta=mySmartFuse-outputpower-instanceparams): dropping requires
+INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
+DEBUG: instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
 =#=#=#= Current cib after: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) =#=#=#=
 <cib epoch="2" num_updates="0" admin_epoch="1">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
     <resources>
       <primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
         <operations>
           <op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
           <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s"/>
           <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s"/>
         </operations>
         <instance_attributes id="mySmartFuse-params">
           <nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
         <!-- a bit hairy but valid -->
         <instance_attributes id="_cibtr-2_mySmartFuse-outputpower-instanceparams">
           <nvpair id="__cibtr-2_mySmartFuse-outputpower-instanceparams__mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status/>
 </cib>
 =#=#=#= End test: Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping) - OK (0) =#=#=#=
 * Passed: cibadmin       - Upgrade to latest CIB schema (trigger 2.10.xsl + the wrapping)
 =#=#=#= Begin test: Query a resource instance attribute (shall survive) =#=#=#=
 outputpower
 =#=#=#= Current cib after: Query a resource instance attribute (shall survive) =#=#=#=
 <cib epoch="2" num_updates="0" admin_epoch="1">
   <configuration>
     <crm_config>
       <cluster_property_set id="cib-bootstrap-options">
         <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
       </cluster_property_set>
     </crm_config>
     <nodes/>
     <resources>
       <primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
         <operations>
           <op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
           <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s"/>
           <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s"/>
         </operations>
         <instance_attributes id="mySmartFuse-params">
           <nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
         </instance_attributes>
         <!-- a bit hairy but valid -->
         <instance_attributes id="_cibtr-2_mySmartFuse-outputpower-instanceparams">
           <nvpair id="__cibtr-2_mySmartFuse-outputpower-instanceparams__mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
         </instance_attributes>
       </primitive>
     </resources>
     <constraints/>
   </configuration>
   <status/>
 </cib>
 =#=#=#= End test: Query a resource instance attribute (shall survive) - OK (0) =#=#=#=
 * Passed: crm_resource   - Query a resource instance attribute (shall survive)
diff --git a/xml/cibtr-2.rng b/xml/cibtr-2.rng
index 0c7651b935..36e832817c 100644
--- a/xml/cibtr-2.rng
+++ b/xml/cibtr-2.rng
@@ -1,198 +1,211 @@
 <!--
  Copyright 2018 Red Hat, Inc.
  Author: Jan Pokorny <jpokorny@redhat.com>
  Part of pacemaker project
  SPDX-License-Identifier: GPL-2.0-or-later
  -->
 <grammar xmlns="http://relaxng.org/ns/structure/1.0"
          xmlns:cibtr="http://clusterlabs.org/ns/pacemaker/cibtr-2"
          datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
   <start>
     <ref name="cibtr-2"/>
   </start>
 
   <define name="cibtr-2">
     <element name="cibtr:map">
       <zeroOrMore>
         <ref name="cibtr-2.table"/>
       </zeroOrMore>
     </element>
   </define>
 
   <define name="cibtr-2.table">
     <element name="cibtr:table">
       <attribute name="for">
         <data type="ID"/>
       </attribute>
       <attribute name="msg-prefix">
         <data type="string"/>
       </attribute>
       <choice>
         <zeroOrMore>
           <ref name="cibtr-2.replace.nonwhereaware"/>
         </zeroOrMore>
         <group>
           <attribute name="where-cases">
             <!-- pipe-delimited enumeration-->
             <data type="string">
               <param name="minLength">1</param>
             </data>
           </attribute>
           <!-- cannot arrange this as an interleave of
                cibtr-2.replace.whereaware+ and
                cibtr-2.replace.nonwhereaware* because of
                http://relaxng.org/spec-20011203.html#attribute-restrictions -->
           <zeroOrMore>
             <ref name="cibtr-2.replace.whereaware"/>
           </zeroOrMore>
         </group>
       </choice>
     </element>
   </define>
 
   <!-- leaf attributes -->
 
   <define name="cibtr-2.replace.attr-in-case-of">
     <attribute name="in-case-of">
       <!-- pipe-delimited enumeration-->
       <data type="string"/>
     </attribute>
   </define>
 
   <define name="cibtr-2.replace.attr-in-case-of-droppable-prefix">
     <attribute name="in-case-of-droppable-prefix">
       <!-- just a single argument taken verbatim -->
       <data type="string">
         <param name="minLength">1</param>
       </data>
     </attribute>
   </define>
 
   <define name="cibtr-2.replace.attr-msg-extra">
     <attribute name="msg-extra">
       <data type="string">
         <param name="minLength">1</param>
       </data>
     </attribute>
   </define>
 
+  <define name="cibtr-2.replace.attr-msg-severity">
+    <attribute name="msg-severity">
+      <choice>
+        <value>WARNING</value>
+        <value>INFO</value>
+        <value>DEBUG</value>
+      </choice>
+    </attribute>
+  </define>
+
   <define name="cibtr-2.replace.attr-redefined-as">
     <attribute name="redefined-as">
       <data type="string">
         <param name="minLength">1</param>
       </data>
     </attribute>
   </define>
 
   <define name="cibtr-2.replace.attr-what">
     <attribute name="what">
       <data type="NCName"/>
     </attribute>
   </define>
 
   <define name="cibtr-2.replace.attr-where">
     <attribute name="where">
       <data type="NCName"/>
     </attribute>
   </define>
 
   <define name="cibtr-2.replace.attr-with-possibly">
     <attribute name="with">
       <choice>
         <data type="NCName"/>
         <empty/>
       </choice>
     </attribute>
   </define>
 
   <define name="cibtr-2.replace.attr-with-surely">
     <attribute name="with">
       <choice>
         <data type="NCName"/>
       </choice>
     </attribute>
   </define>
 
   <define name="cibtr-2.replace.attrs-common">
     <ref name="cibtr-2.replace.attr-what"/>
     <optional>
       <ref name="cibtr-2.replace.attr-msg-extra"/>
     </optional>
+    <optional>
+      <ref name="cibtr-2.replace.attr-msg-severity"/>
+    </optional>
   </define>
 
   <define name="cibtr-2.replace.attrs-redefined-as-in-case-of">
    <ref name="cibtr-2.replace.attr-redefined-as"/>
     <!-- can be combined with in-case-of, but cannot be combined
          with in-case-of-droppable-prefix -->
     <optional>
       <ref name="cibtr-2.replace.attr-in-case-of"/>
     </optional>
   </define>
 
   <!-- leaf production using the above attribute definitions -->
 
   <define name="cibtr-2.replace.nonwhereaware">
     <element name="cibtr:replace">
       <ref name="cibtr-2.replace.attrs-common"/>
       <choice>
         <group>
           <ref name="cibtr-2.replace.attr-with-possibly"/>
           <optional>
             <choice>
               <ref name="cibtr-2.replace.attrs-redefined-as-in-case-of"/>
               <ref name="cibtr-2.replace.attr-in-case-of"/>
             </choice>
           </optional>
         </group>
         <group>
           <ref name="cibtr-2.replace.attr-with-surely"/>
           <optional>
             <choice>
               <ref name="cibtr-2.replace.attrs-redefined-as-in-case-of"/>
               <ref name="cibtr-2.replace.attr-in-case-of"/>
               <ref name="cibtr-2.replace.attr-in-case-of-droppable-prefix"/>
             </choice>
           </optional>
         </group>
       </choice>
     </element>
   </define>
 
   <define name="cibtr-2.replace.whereaware">
     <element name="cibtr:replace">
       <ref name="cibtr-2.replace.attrs-common"/>
       <!-- cf. comment at cibtr-2.table -->
       <choice>
         <group>
           <ref name="cibtr-2.replace.attr-with-surely"/>
           <ref name="cibtr-2.replace.attr-where"/>
           <optional>
             <choice>
               <ref name="cibtr-2.replace.attrs-redefined-as-in-case-of"/>
               <ref name="cibtr-2.replace.attr-in-case-of"/>
               <ref name="cibtr-2.replace.attr-in-case-of-droppable-prefix"/>
             </choice>
           </optional>
         </group>
         <group>
           <ref name="cibtr-2.replace.attr-with-surely"/>
           <optional>
             <ref name="cibtr-2.replace.attr-where"/>
           </optional>
           <choice>
             <ref name="cibtr-2.replace.attrs-redefined-as-in-case-of"/>
             <ref name="cibtr-2.replace.attr-in-case-of"/>
             <ref name="cibtr-2.replace.attr-in-case-of-droppable-prefix"/>
           </choice>
         </group>
         <group>
           <ref name="cibtr-2.replace.attr-with-possibly"/>
           <optional>
             <ref name="cibtr-2.replace.attr-in-case-of"/>
           </optional>
         </group>
       </choice>
     </element>
   </define>
 
 </grammar>
diff --git a/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref.err b/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref.err
index d5dc0e6fef..70adf2787b 100644
--- a/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref.err
+++ b/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref.err
@@ -1 +1 @@
-instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
+DEBUG: instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
diff --git a/xml/test-2-roundtrip/021-instance_atributes-rsc-nonbijective.ref.err b/xml/test-2-roundtrip/021-instance_atributes-rsc-nonbijective.ref.err
index d8e7e827f2..68de733116 100644
--- a/xml/test-2-roundtrip/021-instance_atributes-rsc-nonbijective.ref.err
+++ b/xml/test-2-roundtrip/021-instance_atributes-rsc-nonbijective.ref.err
@@ -1,5 +1,5 @@
-Resources-operation instance_attributes: mySmartFuse-monitor-inputpower (rsc=mySmartFuse, meta=mySmartFuse-inputpower-instanceparams): dropping requires
-Resources-operation instance_attributes: ... only start/promote operation taken into account
-Resources-operation instance_attributes: mySmartFuse-monitor-outputpower (rsc=mySmartFuse, meta=mySmartFuse-outputpower-instanceparams): dropping requires
-Resources-operation instance_attributes: ... only start/promote operation taken into account
-instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
+INFO: Resources-operation instance_attributes: mySmartFuse-monitor-inputpower (rsc=mySmartFuse, meta=mySmartFuse-inputpower-instanceparams): dropping requires
+INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
+INFO: Resources-operation instance_attributes: mySmartFuse-monitor-outputpower (rsc=mySmartFuse, meta=mySmartFuse-outputpower-instanceparams): dropping requires
+INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
+DEBUG: instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
diff --git a/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref.err b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref.err
index 95985d568f..50791bf19c 100644
--- a/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref.err
+++ b/xml/test-2/010-rsc_colocation-dropped-for-noop-sa.ref.err
@@ -1,2 +1,2 @@
-Constraints-colocation: colocation-addr-httpd: dropping score-attribute
-Constraints-colocation: ... was actually never in effect
+INFO: Constraints-colocation: colocation-addr-httpd: dropping score-attribute
+INFO: Constraints-colocation: ... was actually never in effect
diff --git a/xml/test-2/020-rsc-requires-inline.ref.err b/xml/test-2/020-rsc-requires-inline.ref.err
index a13b4f27bd..9c6569747d 100644
--- a/xml/test-2/020-rsc-requires-inline.ref.err
+++ b/xml/test-2/020-rsc-requires-inline.ref.err
@@ -1 +1 @@
-Resources-operation: myAddr-start (rsc=myAddr): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: myAddr-start (rsc=myAddr): moving requires under meta_attributes as requires unless already defined there for matching start|promote
diff --git a/xml/test-2/021-rsc-requires-nvpair.ref.err b/xml/test-2/021-rsc-requires-nvpair.ref.err
index 9a04c4732e..6650f159f3 100644
--- a/xml/test-2/021-rsc-requires-nvpair.ref.err
+++ b/xml/test-2/021-rsc-requires-nvpair.ref.err
@@ -1 +1 @@
-Resources-operation: myAddr-start (rsc=myAddr, meta=myAddr-start-metaparams): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: myAddr-start (rsc=myAddr, meta=myAddr-start-metaparams): moving requires under meta_attributes as requires unless already defined there for matching start|promote
diff --git a/xml/test-2/022-rsc-requires-counterexamples.ref.err b/xml/test-2/022-rsc-requires-counterexamples.ref.err
index 5f89215b1b..6f6a9954fb 100644
--- a/xml/test-2/022-rsc-requires-counterexamples.ref.err
+++ b/xml/test-2/022-rsc-requires-counterexamples.ref.err
@@ -1,2 +1,2 @@
-Resources-operation: myAddr-stop (rsc=myAddr): dropping requires
-Resources-operation: ... only start/promote operation taken into account
+INFO: Resources-operation: myAddr-stop (rsc=myAddr): dropping requires
+INFO: Resources-operation: ... only start/promote operation taken into account
diff --git a/xml/test-2/023-rsc-requires-no-override.ref.err b/xml/test-2/023-rsc-requires-no-override.ref.err
index 100fab93c6..ad680b6302 100644
--- a/xml/test-2/023-rsc-requires-no-override.ref.err
+++ b/xml/test-2/023-rsc-requires-no-override.ref.err
@@ -1,4 +1,4 @@
-Resources-operation: myAddr-start (rsc=myAddr): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful-promote (rsc=stateful, meta=stateful-promote-meta): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful-demote (rsc=stateful, meta=stateful-demote-meta): dropping requires
-Resources-operation: ... only start/promote operation taken into account
+DEBUG: Resources-operation: myAddr-start (rsc=myAddr): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: stateful-promote (rsc=stateful, meta=stateful-promote-meta): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+INFO: Resources-operation: stateful-demote (rsc=stateful, meta=stateful-demote-meta): dropping requires
+INFO: Resources-operation: ... only start/promote operation taken into account
diff --git a/xml/test-2/024-rsc-requires-no-selfclash.ref.err b/xml/test-2/024-rsc-requires-no-selfclash.ref.err
index 49d9683336..b275532b33 100644
--- a/xml/test-2/024-rsc-requires-no-selfclash.ref.err
+++ b/xml/test-2/024-rsc-requires-no-selfclash.ref.err
@@ -1,14 +1,14 @@
-Resources-operation: myAddr1-start (rsc=myAddr1, meta=myAddr1-start-meta): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: myAddr1-start (rsc=myAddr1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: myAddr2-start (rsc=myAddr2, meta=myAddr2-start-meta): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: myAddr2-start (rsc=myAddr2): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful1-demote (rsc=stateful1, meta=stateful1-demote-meta): dropping requires
-Resources-operation: ... only start/promote operation taken into account
-Resources-operation: stateful1-promote (rsc=stateful1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful1-start (rsc=stateful1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful2-promote (rsc=stateful2, meta=stateful2-promote-meta1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful2-promote (rsc=stateful2, meta=stateful2-promote-meta1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful2-promote (rsc=stateful2, meta=stateful2-promote-meta2): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful2-start (rsc=stateful2, meta=stateful2-promote-meta3): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful2-demote (rsc=stateful2, meta=stateful2-promote-meta): dropping requires
-Resources-operation: ... only start/promote operation taken into account
+DEBUG: Resources-operation: myAddr1-start (rsc=myAddr1, meta=myAddr1-start-meta): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: myAddr1-start (rsc=myAddr1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: myAddr2-start (rsc=myAddr2, meta=myAddr2-start-meta): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: myAddr2-start (rsc=myAddr2): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+INFO: Resources-operation: stateful1-demote (rsc=stateful1, meta=stateful1-demote-meta): dropping requires
+INFO: Resources-operation: ... only start/promote operation taken into account
+DEBUG: Resources-operation: stateful1-promote (rsc=stateful1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: stateful1-start (rsc=stateful1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: stateful2-promote (rsc=stateful2, meta=stateful2-promote-meta1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: stateful2-promote (rsc=stateful2, meta=stateful2-promote-meta1): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: stateful2-promote (rsc=stateful2, meta=stateful2-promote-meta2): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: stateful2-start (rsc=stateful2, meta=stateful2-promote-meta3): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+INFO: Resources-operation: stateful2-demote (rsc=stateful2, meta=stateful2-promote-meta): dropping requires
+INFO: Resources-operation: ... only start/promote operation taken into account
diff --git a/xml/test-2/030-clu-props-plain-rename.ref.err b/xml/test-2/030-clu-props-plain-rename.ref.err
index 32306f9f53..878c504320 100644
--- a/xml/test-2/030-clu-props-plain-rename.ref.err
+++ b/xml/test-2/030-clu-props-plain-rename.ref.err
@@ -1,13 +1,13 @@
-Cluster properties: cluster-opts-cluster_recheck_interval: renaming cluster_recheck_interval as cluster-recheck-interval
-Cluster properties: cluster-opts-dc_deadtime: renaming dc_deadtime as dc-deadtime
-Cluster properties: cluster-opts-election_timeout: renaming election_timeout as election-timeout
-Cluster properties: cluster-opts-no_quorum_policy: renaming no_quorum_policy as no-quorum-policy
-Cluster properties: cluster-opts-remove_after_stop: renaming remove_after_stop as remove-after-stop
-Cluster properties: cluster-opts-shutdown_escalation: renaming shutdown_escalation as shutdown-escalation
-Cluster properties: cluster-opts-startup_fencing: renaming startup_fencing as startup-fencing
-Cluster properties: cluster-opts-stonith_action: renaming stonith_action as stonith-action
-Cluster properties: cluster-opts-stonith_enabled: renaming stonith_enabled as stonith-enabled
-Cluster properties: cluster-opts-stop_orphan_actions: renaming stop_orphan_actions as stop-orphan-actions
-Cluster properties: cluster-opts-stop_orphan_resources: renaming stop_orphan_resources as stop-orphan-resources
-Cluster properties: cluster-opts-symmetric_cluster: renaming symmetric_cluster as symmetric-cluster
-Cluster properties: cluster-opts-transition_idle_timeout: renaming transition_idle_timeout as cluster-delay
+DEBUG: Cluster properties: cluster-opts-cluster_recheck_interval: renaming cluster_recheck_interval as cluster-recheck-interval
+DEBUG: Cluster properties: cluster-opts-dc_deadtime: renaming dc_deadtime as dc-deadtime
+DEBUG: Cluster properties: cluster-opts-election_timeout: renaming election_timeout as election-timeout
+DEBUG: Cluster properties: cluster-opts-no_quorum_policy: renaming no_quorum_policy as no-quorum-policy
+DEBUG: Cluster properties: cluster-opts-remove_after_stop: renaming remove_after_stop as remove-after-stop
+DEBUG: Cluster properties: cluster-opts-shutdown_escalation: renaming shutdown_escalation as shutdown-escalation
+DEBUG: Cluster properties: cluster-opts-startup_fencing: renaming startup_fencing as startup-fencing
+DEBUG: Cluster properties: cluster-opts-stonith_action: renaming stonith_action as stonith-action
+DEBUG: Cluster properties: cluster-opts-stonith_enabled: renaming stonith_enabled as stonith-enabled
+DEBUG: Cluster properties: cluster-opts-stop_orphan_actions: renaming stop_orphan_actions as stop-orphan-actions
+DEBUG: Cluster properties: cluster-opts-stop_orphan_resources: renaming stop_orphan_resources as stop-orphan-resources
+DEBUG: Cluster properties: cluster-opts-symmetric_cluster: renaming symmetric_cluster as symmetric-cluster
+DEBUG: Cluster properties: cluster-opts-transition_idle_timeout: renaming transition_idle_timeout as cluster-delay
diff --git a/xml/test-2/031-clu-props-drop.ref.err b/xml/test-2/031-clu-props-drop.ref.err
index ca172ef2db..b26de82fc4 100644
--- a/xml/test-2/031-clu-props-drop.ref.err
+++ b/xml/test-2/031-clu-props-drop.ref.err
@@ -1,10 +1,10 @@
-Cluster properties: cluster-opts-cluster-infrastructure: dropping cluster-infrastructure for matching heartbeat|openais|classic openais|classic openais (with plugin)|cman
-Cluster properties: ... corosync (2+) infrastructure can be used instead, though the value is not of significance
-Cluster properties: cluster-opts-default-migration-threshold: dropping default-migration-threshold
-Cluster properties: ... migration-threshold in rsc_defaults can be configured instead
-Cluster properties: cluster-opts-default_migration_threshold: dropping default_migration_threshold
-Cluster properties: ... migration-threshold in rsc_defaults can be configured instead
-Cluster properties: cluster-opts-expected-quorum-votes: dropping expected-quorum-votes
-Cluster properties: ... corosync (2+) infrastructure tracks quorum on its own
-Cluster properties: cluster-opts-notification-agent: dropping notification-agent
-Cluster properties: ... standalone alerts can be configured instead
+INFO: Cluster properties: cluster-opts-cluster-infrastructure: dropping cluster-infrastructure for matching heartbeat|openais|classic openais|classic openais (with plugin)|cman
+INFO: Cluster properties: ... corosync (2+) infrastructure can be used instead, though the value is not of significance
+INFO: Cluster properties: cluster-opts-default-migration-threshold: dropping default-migration-threshold
+INFO: Cluster properties: ... migration-threshold in rsc_defaults can be configured instead
+INFO: Cluster properties: cluster-opts-default_migration_threshold: dropping default_migration_threshold
+INFO: Cluster properties: ... migration-threshold in rsc_defaults can be configured instead
+INFO: Cluster properties: cluster-opts-expected-quorum-votes: dropping expected-quorum-votes
+INFO: Cluster properties: ... corosync (2+) infrastructure tracks quorum on its own
+INFO: Cluster properties: cluster-opts-notification-agent: dropping notification-agent
+INFO: Cluster properties: ... standalone alerts can be configured instead
diff --git a/xml/test-2/032-clu-props-move.ref.err b/xml/test-2/032-clu-props-move.ref.err
index 417b355df6..ed5d3d3e28 100644
--- a/xml/test-2/032-clu-props-move.ref.err
+++ b/xml/test-2/032-clu-props-move.ref.err
@@ -1,3 +1,3 @@
-Cluster properties: cluster-opts-default-action-timeout: moving default-action-timeout under op_defaults as timeout unless already defined there
-Cluster properties: cluster-opts-default-resource-stickiness: moving default-resource-stickiness under rsc_defaults as resource-stickiness unless already defined there
-Cluster properties: cluster-opts-is-managed-default: moving is-managed-default under rsc_defaults as is-managed unless already defined there
+DEBUG: Cluster properties: cluster-opts-default-action-timeout: moving default-action-timeout under op_defaults as timeout unless already defined there
+DEBUG: Cluster properties: cluster-opts-default-resource-stickiness: moving default-resource-stickiness under rsc_defaults as resource-stickiness unless already defined there
+DEBUG: Cluster properties: cluster-opts-is-managed-default: moving is-managed-default under rsc_defaults as is-managed unless already defined there
diff --git a/xml/test-2/033-clu-props-move-merge.ref.err b/xml/test-2/033-clu-props-move-merge.ref.err
index 417b355df6..ed5d3d3e28 100644
--- a/xml/test-2/033-clu-props-move-merge.ref.err
+++ b/xml/test-2/033-clu-props-move-merge.ref.err
@@ -1,3 +1,3 @@
-Cluster properties: cluster-opts-default-action-timeout: moving default-action-timeout under op_defaults as timeout unless already defined there
-Cluster properties: cluster-opts-default-resource-stickiness: moving default-resource-stickiness under rsc_defaults as resource-stickiness unless already defined there
-Cluster properties: cluster-opts-is-managed-default: moving is-managed-default under rsc_defaults as is-managed unless already defined there
+DEBUG: Cluster properties: cluster-opts-default-action-timeout: moving default-action-timeout under op_defaults as timeout unless already defined there
+DEBUG: Cluster properties: cluster-opts-default-resource-stickiness: moving default-resource-stickiness under rsc_defaults as resource-stickiness unless already defined there
+DEBUG: Cluster properties: cluster-opts-is-managed-default: moving is-managed-default under rsc_defaults as is-managed unless already defined there
diff --git a/xml/test-2/034-clu-props-move-redef.ref.err b/xml/test-2/034-clu-props-move-redef.ref.err
index 85db6428f3..f8c148f382 100644
--- a/xml/test-2/034-clu-props-move-redef.ref.err
+++ b/xml/test-2/034-clu-props-move-redef.ref.err
@@ -1,3 +1,3 @@
-Cluster properties: cluster-opts-default-resource-failure-stickiness: moving default-resource-failure-stickiness under rsc_defaults as migration-threshold unless already defined there, redefined as 1, for matching -INFINITY
-Cluster properties: cluster-opts-default_resource_failure_stickiness: dropping default_resource_failure_stickiness
-Cluster properties: ... migration-threshold in rsc_defaults can be configured instead
+DEBUG: Cluster properties: cluster-opts-default-resource-failure-stickiness: moving default-resource-failure-stickiness under rsc_defaults as migration-threshold unless already defined there, redefined as 1, for matching -INFINITY
+INFO: Cluster properties: cluster-opts-default_resource_failure_stickiness: dropping default_resource_failure_stickiness
+INFO: Cluster properties: ... migration-threshold in rsc_defaults can be configured instead
diff --git a/xml/test-2/040-nodes-rename-type.ref.err b/xml/test-2/040-nodes-rename-type.ref.err
index e5a6b64a36..ce68fa4e9e 100644
--- a/xml/test-2/040-nodes-rename-type.ref.err
+++ b/xml/test-2/040-nodes-rename-type.ref.err
@@ -1,2 +1,2 @@
-Cluster node: virt-063 (id=virt-063): keeping type as type, redefined as member, for matching normal
-Cluster node: virt-064 (id=virt-064): keeping type as type, redefined as member, for matching normal
+DEBUG: Cluster node: virt-063 (id=virt-063): keeping type as type, redefined as member, for matching normal
+DEBUG: Cluster node: virt-064 (id=virt-064): keeping type as type, redefined as member, for matching normal
diff --git a/xml/test-2/050-rsc-attrs-instance-plain-rename.ref.err b/xml/test-2/050-rsc-attrs-instance-plain-rename.ref.err
index 2d3b3b8c50..a3129e54c9 100644
--- a/xml/test-2/050-rsc-attrs-instance-plain-rename.ref.err
+++ b/xml/test-2/050-rsc-attrs-instance-plain-rename.ref.err
@@ -1 +1 @@
-Resource instance_attributes: fence-vbox-pcmk_monitor_cmd: renaming pcmk_monitor_cmd as pcmk_monitor_action
+DEBUG: Resource instance_attributes: fence-vbox-pcmk_monitor_cmd: renaming pcmk_monitor_cmd as pcmk_monitor_action
diff --git a/xml/test-2/051-rsc-attrs-instance-pcmk_arg_map.ref.err b/xml/test-2/051-rsc-attrs-instance-pcmk_arg_map.ref.err
index b7dfd08fea..a0149c1661 100644
--- a/xml/test-2/051-rsc-attrs-instance-pcmk_arg_map.ref.err
+++ b/xml/test-2/051-rsc-attrs-instance-pcmk_arg_map.ref.err
@@ -1,3 +1,3 @@
-Resource instance_attributes: fence-vbox1-pcmk_arg_map: renaming pcmk_arg_map as pcmk_host_argument for matching port: prefix that will, meanwhile, get dropped
-Resource instance_attributes: fence-vbox2-pcmk_arg_map: dropping pcmk_arg_map
-Resource instance_attributes: fence-vbox3-pcmk_arg_map: dropping pcmk_arg_map
+DEBUG: Resource instance_attributes: fence-vbox1-pcmk_arg_map: renaming pcmk_arg_map as pcmk_host_argument for matching port: prefix that will, meanwhile, get dropped
+DEBUG: Resource instance_attributes: fence-vbox2-pcmk_arg_map: dropping pcmk_arg_map
+DEBUG: Resource instance_attributes: fence-vbox3-pcmk_arg_map: dropping pcmk_arg_map
diff --git a/xml/test-2/060-rsc-attrs-meta-isolation.ref.err b/xml/test-2/060-rsc-attrs-meta-isolation.ref.err
index 32533f92fd..fb40cc4a5f 100644
--- a/xml/test-2/060-rsc-attrs-meta-isolation.ref.err
+++ b/xml/test-2/060-rsc-attrs-meta-isolation.ref.err
@@ -1,4 +1,4 @@
-Resource meta_attributes: fake (meta=fake-meta_attributes): renaming isolation-wrapper as target-role, redefined as Stopped
-Resource meta_attributes: ... i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources
-Resource meta_attributes: fake (meta=fake-meta_attributes): renaming isolation-wrapper as target-role, redefined as Stopped
-Resource meta_attributes: ... i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources
+WARNING: Resource meta_attributes: fake (meta=fake-meta_attributes): renaming isolation-wrapper as target-role, redefined as Stopped
+WARNING: Resource meta_attributes: ... i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources
+WARNING: Resource meta_attributes: fake (meta=fake-meta_attributes): renaming isolation-wrapper as target-role, redefined as Stopped
+WARNING: Resource meta_attributes: ... i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources
diff --git a/xml/test-2/061-rsc-attrs-meta-exchange.ref.err b/xml/test-2/061-rsc-attrs-meta-exchange.ref.err
index 03c7a6fcbd..2938b77b13 100644
--- a/xml/test-2/061-rsc-attrs-meta-exchange.ref.err
+++ b/xml/test-2/061-rsc-attrs-meta-exchange.ref.err
@@ -1,3 +1,3 @@
-Resource meta_attributes: res1 (meta=res1-meta_attributes): renaming resource-failure-stickiness as migration-threshold, redefined as 1, for matching -INFINITY
-Resource meta_attributes: res2 (meta=res2-meta_attributes): dropping resource-failure-stickiness
-Resource meta_attributes: ... migration-threshold can be configured instead
+DEBUG: Resource meta_attributes: res1 (meta=res1-meta_attributes): renaming resource-failure-stickiness as migration-threshold, redefined as 1, for matching -INFINITY
+INFO: Resource meta_attributes: res2 (meta=res2-meta_attributes): dropping resource-failure-stickiness
+INFO: Resource meta_attributes: ... migration-threshold can be configured instead
diff --git a/xml/test-2/070-rsc-op-attrs-inst-requires-start.ref.err b/xml/test-2/070-rsc-op-attrs-inst-requires-start.ref.err
index 1aa7937627..6f707bbfda 100644
--- a/xml/test-2/070-rsc-op-attrs-inst-requires-start.ref.err
+++ b/xml/test-2/070-rsc-op-attrs-inst-requires-start.ref.err
@@ -1 +1 @@
-Resources-operation instance_attributes: myAddr-start (rsc=myAddr, meta=myAddr-start-instanceparams): moving requires under per-resource-meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation instance_attributes: myAddr-start (rsc=myAddr, meta=myAddr-start-instanceparams): moving requires under per-resource-meta_attributes as requires unless already defined there for matching start|promote
diff --git a/xml/test-2/071-rsc-op-attrs-inst-requires-nonstart.ref.err b/xml/test-2/071-rsc-op-attrs-inst-requires-nonstart.ref.err
index 0865c594da..6b6f8f7b19 100644
--- a/xml/test-2/071-rsc-op-attrs-inst-requires-nonstart.ref.err
+++ b/xml/test-2/071-rsc-op-attrs-inst-requires-nonstart.ref.err
@@ -1,2 +1,2 @@
-Resources-operation instance_attributes: myAddr-stop (rsc=myAddr, meta=myAddr-stop-instanceparams): dropping requires
-Resources-operation instance_attributes: ... only start/promote operation taken into account
+INFO: Resources-operation instance_attributes: myAddr-stop (rsc=myAddr, meta=myAddr-stop-instanceparams): dropping requires
+INFO: Resources-operation instance_attributes: ... only start/promote operation taken into account
diff --git a/xml/test-2/072-rsc-op-attrs-inst-requires-no-override.ref.err b/xml/test-2/072-rsc-op-attrs-inst-requires-no-override.ref.err
index bacdc09be7..cc5dd7d22a 100644
--- a/xml/test-2/072-rsc-op-attrs-inst-requires-no-override.ref.err
+++ b/xml/test-2/072-rsc-op-attrs-inst-requires-no-override.ref.err
@@ -1,4 +1,4 @@
-Resources-operation instance_attributes: myAddr-start (rsc=myAddr, meta=myAddr-start-instance): moving requires under per-resource-meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: myAddr-start (rsc=myAddr): moving requires under meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation instance_attributes: stateful-promote (rsc=stateful, meta=stateful-promote-instance): moving requires under per-resource-meta_attributes as requires unless already defined there for matching start|promote
-Resources-operation: stateful-promote (rsc=stateful, meta=stateful-promote-meta): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation instance_attributes: myAddr-start (rsc=myAddr, meta=myAddr-start-instance): moving requires under per-resource-meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: myAddr-start (rsc=myAddr): moving requires under meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation instance_attributes: stateful-promote (rsc=stateful, meta=stateful-promote-instance): moving requires under per-resource-meta_attributes as requires unless already defined there for matching start|promote
+DEBUG: Resources-operation: stateful-promote (rsc=stateful, meta=stateful-promote-meta): moving requires under meta_attributes as requires unless already defined there for matching start|promote
diff --git a/xml/test-2/073-rsc-op-attrs-inst-meta-meaning.ref.err b/xml/test-2/073-rsc-op-attrs-inst-meta-meaning.ref.err
index 0410a57811..18beb3aefa 100644
--- a/xml/test-2/073-rsc-op-attrs-inst-meta-meaning.ref.err
+++ b/xml/test-2/073-rsc-op-attrs-inst-meta-meaning.ref.err
@@ -1,4 +1,4 @@
-Resources-operation instance_attributes: myAddr-start (rsc=myAddr, meta=myAddr-start-instance): moving on-fail under meta_attributes as on-fail unless already defined there
-Resources-operation instance_attributes: myAddr-start (rsc=myAddr, meta=myAddr-start-instance): moving record-pending under meta_attributes as record-pending unless already defined there
-Resources-operation instance_attributes: myHttpd-monitor (rsc=myHttpd, meta=myHttpd-monitor-instance): moving timeout under meta_attributes as timeout unless already defined there
-Resources-operation instance_attributes: myHttpd-monitor (rsc=myHttpd, meta=myHttpd-monitor-instance2): moving timeout under meta_attributes as timeout unless already defined there
+DEBUG: Resources-operation instance_attributes: myAddr-start (rsc=myAddr, meta=myAddr-start-instance): moving on-fail under meta_attributes as on-fail unless already defined there
+DEBUG: Resources-operation instance_attributes: myAddr-start (rsc=myAddr, meta=myAddr-start-instance): moving record-pending under meta_attributes as record-pending unless already defined there
+DEBUG: Resources-operation instance_attributes: myHttpd-monitor (rsc=myHttpd, meta=myHttpd-monitor-instance): moving timeout under meta_attributes as timeout unless already defined there
+DEBUG: Resources-operation instance_attributes: myHttpd-monitor (rsc=myHttpd, meta=myHttpd-monitor-instance2): moving timeout under meta_attributes as timeout unless already defined there
diff --git a/xml/upgrade-2.10-leave.xsl b/xml/upgrade-2.10-leave.xsl
index 608c120c92..6e3fe65eda 100644
--- a/xml/upgrade-2.10-leave.xsl
+++ b/xml/upgrade-2.10-leave.xsl
@@ -1,226 +1,230 @@
 <!--
  Copyright 2018 Red Hat, Inc.
  Author: Jan Pokorny <jpokorny@redhat.com>
  Part of pacemaker project
  SPDX-License-Identifier: GPL-2.0-or-later
  -->
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:cibtr="http://clusterlabs.org/ns/pacemaker/cibtr-2"
                 exclude-result-prefixes="cibtr"
 		cibtr:filename="upgrade-2.10-leave.xsl">
 <xsl:output method="xml" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
 
+<xsl:param name="cibtr:label-debug"   select="'DEBUG: '"/>
 
 <!--
 
  GENERIC UTILITIES
 
  -->
 
 <!--
  Recursive implementation of "basename"
 
  Merely parameter driven, no implicit context taken into account:
  - Uri: input in it's current phase of processing
 -->
 <xsl:template name="cibtr:WrapSpecificBasename">
   <xsl:param name="Uri"/>
   <xsl:choose>
     <xsl:when test="not(contains($Uri, '/'))">
       <xsl:value-of select="$Uri"/>
     </xsl:when>
     <xsl:otherwise>
       <xsl:call-template name="cibtr:WrapSpecificBasename">
         <xsl:with-param name="Uri"
                         select="substring-after($Uri, '/')"/>
       </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
 <!--
  Id-mangling-enriched identity template.
  -->
 <xsl:template name="cibtr:HelperIdentityLeave">
   <xsl:copy>
     <xsl:apply-templates select="@*|node()" mode="cibtr:leave"/>
   </xsl:copy>
 </xsl:template>
 
 
 <!--
 
  ACTUAL TRANSFORMATION
 
  Extra modes: cibtr:leave
               cibtr:leave-serialize
 
  -->
 
 <xsl:variable name="cibtr:WrapSpecificPrefix">
   <!-- no sleek way to fetch this, top-level xmlns:cibtr disappears early -->
   <xsl:call-template name="cibtr:WrapSpecificBasename">
     <xsl:with-param name="Uri"
       select="namespace-uri(document('')/xsl:stylesheet/@cibtr:filename)"/>
   </xsl:call-template>
 </xsl:variable>
 
 <xsl:variable name="cibtr:WrapSpecificPrefixInitialRoot"
               select="concat('_', $cibtr:WrapSpecificPrefix, '_')"/>
 
 <!--
  cibtr:leave-serialize mode
  -->
 
 <xsl:template match="@*|node()" mode="cibtr:leave-serialize">
   <xsl:choose>
     <xsl:when test="count(.|../@*)=count(../@*)
                     and
                     name() = 'id'">
       <!-- intentionally skip -->
     </xsl:when>
     <xsl:when test="count(.|../@*)=count(../@*)
                     or
                     self::processing-instruction()">
       <xsl:variable name="Mark">
         <xsl:if test="count(.|../@*)=count(../@*)">A</xsl:if>
         <xsl:if test="self::processing-instruction()">P</xsl:if>
       </xsl:variable>
       <xsl:value-of select="concat($Mark, '(', name(), '=', ., '),')"/>
     </xsl:when>
     <xsl:when test="self::*">
       <xsl:value-of select="concat('E(', name(), ',')"/>
       <xsl:apply-templates select="@*|node()"
                            mode="cibtr:leave-serialize"/>
       <xsl:value-of select="'),'"/>
     </xsl:when>
     <xsl:when test="self::comment()|self::text()">
       <xsl:variable name="Mark">
         <xsl:if test="self::comment()">C</xsl:if>
         <xsl:if test="self::text()">T</xsl:if>
       </xsl:variable>
       <xsl:value-of select="concat($Mark, '(', ., '),')"/>
     </xsl:when>
   </xsl:choose>
 </xsl:template>
 
 <!--
  cibtr:leave mode
  -->
 
 <!--
  This is to cover elements with the internal structure characterized
  with the following RelaxNG Compact encoded grammar:
 
  > attribute id-ref { xsd:IDREF }
  > | (attribute id { xsd:ID },
  >    (rule?
  >     & nvpair*
  >     & attribute score {
  >         xsd:integer
  >         | xsd:token "INFINITY"
  >         | xsd:token "+INFINITY"
  >         | xsd:token "-INFINITY"
  >       }?))
 
  The context node corresponds to "@id-ref" branch prior to unfolding
  in the preceding "unfold" XSLT counterpart, and Original to the other,
  and the task here is to recursively (and deterministically) compare
  the content of the two, and when there's a match, to collapse the
  former back to a mere empty @id-ref link.
 
  NOTE: name of this template may be a bit misleading, but it's meant
        to really mean "after upgrade of the same trailing numbers",
        which effectively means we are playing per 3.X CIB schema
        rules, which needs to be considered, should any element be
        renamed, etc.
  -->
 <xsl:template match="*[
                        contains(
                          concat('|cluster_property_set',
                                 '|instance_attributes|',
                                 '|meta_attributes|'),
                          concat('|', name(), '|')
                        )
                      ]"
               mode="cibtr:leave">
   <xsl:variable name="Original"
                 select="//*[
                           name() = name(current())
                           and
                           @id = substring-after(current()/@id,
                                                 $cibtr:WrapSpecificPrefixInitialRoot)
                         ]"/>
   <xsl:choose>
     <xsl:when test="not(
                       starts-with(@id, $cibtr:WrapSpecificPrefixInitialRoot)
                     )">
       <xsl:copy>
         <xsl:apply-templates select="@*|node()"
                              mode="cibtr:leave"/>
       </xsl:copy>
     </xsl:when>
     <xsl:when test="count($Original) = 0">
-      <xsl:message>
-        <xsl:value-of select="concat(name(), ': original element pointed to',
-                                     ' with @id-ref (',
-                                     substring-after(@id,
-                                                     $cibtr:WrapSpecificPrefixInitialRoot),
-                                     ') disappeared during upgrade')"/>
-      </xsl:message>
+      <xsl:if test="string($cibtr:label-debug) != string(false())">
+        <xsl:message>
+          <xsl:value-of select="concat($cibtr:label-debug, name(),
+                                       ': original element pointed to with',
+                                       ' @id-ref (',
+                                       substring-after(@id,
+                                                       $cibtr:WrapSpecificPrefixInitialRoot),
+                                       ') disappeared during upgrade')"/>
+        </xsl:message>
+      </xsl:if>
       <xsl:copy>
         <xsl:apply-templates select="@*|node()"
                              mode="cibtr:leave"/>
       </xsl:copy>
     </xsl:when>
     <xsl:when test="count($Original) != 1">
       <xsl:message terminate="yes">
         <xsl:value-of select="concat('INTERNAL ERROR:',
                                      name(), ': found several elements',
                                      ' that possibly were originally',
                                      ' pointed to with @id-ref (',
                                      substring-after(@id,
                                                      $cibtr:WrapSpecificPrefixInitialRoot),
                                      '); unexpected ambiguity')"/>
       </xsl:message>
     </xsl:when>
     <xsl:otherwise>
       <xsl:variable name="SerializedOriginal">
         <xsl:apply-templates select="$Original/@*[name() != 'id']
                                      |$Original/node()"
                              mode="cibtr:leave-serialize"/>
       </xsl:variable>
       <xsl:variable name="SerializedDependant">
         <xsl:apply-templates select="@*[name() != 'id']
                                      |node()"
                              mode="cibtr:leave-serialize"/>
       </xsl:variable>
       <xsl:copy>
         <xsl:choose>
           <xsl:when test="$SerializedOriginal = $SerializedDependant">
             <xsl:attribute name="id-ref">
               <xsl:value-of select="substring-after(@id,
                                                     $cibtr:WrapSpecificPrefixInitialRoot)"/>
             </xsl:attribute>
           </xsl:when>
           <xsl:otherwise>
             <xsl:apply-templates select="@*|node()"
                                  mode="cibtr:leave">
             </xsl:apply-templates>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:copy>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
 <xsl:template match="@*|node()" mode="cibtr:leave">
   <xsl:call-template name="cibtr:HelperIdentityLeave"/>
 </xsl:template>
 
 <!-- mode-less, easy to override kick-off -->
 <xsl:template match="/">
   <xsl:call-template name="cibtr:HelperIdentityLeave"/>
 </xsl:template>
 
 </xsl:stylesheet>
diff --git a/xml/upgrade-2.10.xsl b/xml/upgrade-2.10.xsl
index dec4e7b88b..526ef6d2d9 100644
--- a/xml/upgrade-2.10.xsl
+++ b/xml/upgrade-2.10.xsl
@@ -1,2522 +1,2569 @@
 <!--
  Copyright 2018 Red Hat, Inc.
  Author: Jan Pokorny <jpokorny@redhat.com>
  Part of pacemaker project
  SPDX-License-Identifier: GPL-2.0-or-later
  -->
 
 <!--
  Not compatible with @id-ref occurrences!  Normalize generic 2.X-compatible
  instances with upgrade-2.10-enter.xsl (optionally denormalize back akin
  to the original with upgrade-2.10-leave.xsl once the upgrade is finished).
 -->
 
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:cibtr="http://clusterlabs.org/ns/pacemaker/cibtr-2"
                 exclude-result-prefixes="cibtr">
 <xsl:output method="xml" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
 
 <xsl:param name="cibtr:cib-min-ver" select="'3.0'"/>
+<xsl:param name="cibtr:label-warning" select="'WARNING: '"/>
+<xsl:param name="cibtr:label-info"    select="'INFO: '"/>
+<xsl:param name="cibtr:label-debug"   select="'DEBUG: '"/>
 
 <!--
 
  HELPER DEFINITIONS
 
  -->
 
 <cibtr:map>
 
   <!--
    Target tag:     cluster_property_set
    Object:         ./nvpair/@name
    Selector ctxt:  ./nvpair/@value
    Move ctxt:      op_defaults ~ /cib/configuration/op_defaults
                    rsc_defaults ~ /cib/configuration/rsc_defaults
    Related commit: c1c66fe13
                    +
                    7a9891f29
                    7d0d1b0eb
                    1f643d610
                    73a5d63a8
                    +
                    642a09b22
                    0c03e366d
                    a28a558f9
    -->
   <cibtr:table for="cluster-properties" msg-prefix="Cluster properties"
                where-cases="op_defaults|rsc_defaults">
     <cibtr:replace what="cluster-infrastructure"
                    with=""
                    in-case-of="heartbeat|openais|classic openais|classic openais (with plugin)|cman"
                    msg-extra="corosync (2+) infrastructure can be used instead, though the value is not of significance"/>
 
     <cibtr:replace what="cluster_recheck_interval"
                    with="cluster-recheck-interval"/>
     <cibtr:replace what="dc_deadtime"
                    with="dc-deadtime"/>
 
     <cibtr:replace what="default-action-timeout"
                    with="timeout"
                    where="op_defaults"/>
     <cibtr:replace what="default_action_timeout"
                    with="timeout"
                    where="op_defaults"/>
 
     <cibtr:replace what="default-migration-threshold"
                    with=""
                    msg-extra="migration-threshold in rsc_defaults can be configured instead"/>
     <cibtr:replace what="default_migration_threshold"
                    with=""
                    msg-extra="migration-threshold in rsc_defaults can be configured instead"/>
 
     <cibtr:replace what="default-resource-stickiness"
                    with="resource-stickiness"
                    where="rsc_defaults"/>
     <cibtr:replace what="default_resource_stickiness"
                    with="resource-stickiness"
                    where="rsc_defaults"/>
 
     <cibtr:replace what="default-resource-failure-stickiness"
                    with="migration-threshold"
                    where="rsc_defaults"
                    in-case-of="-INFINITY"
                    redefined-as="1"/>
     <cibtr:replace what="default-resource-failure-stickiness"
                    with=""
                    msg-extra="migration-threshold in rsc_defaults can be configured instead"/>
     <cibtr:replace what="default_resource_failure_stickiness"
                    with="migration-threshold"
                    where="rsc_defaults"
                    in-case-of="-INFINITY"
                    redefined-as="1"/>
     <cibtr:replace what="default_resource_failure_stickiness"
                    with=""
                    msg-extra="migration-threshold in rsc_defaults can be configured instead"/>
 
     <cibtr:replace what="election_timeout"
                    with="election-timeout"/>
     <cibtr:replace what="expected-quorum-votes"
                    with=""
                    msg-extra="corosync (2+) infrastructure tracks quorum on its own"/>
 
     <cibtr:replace what="is-managed-default"
                    with="is-managed"
                    where="rsc_defaults"/>
     <cibtr:replace what="is_managed_default"
                    with="is-managed"
                    where="rsc_defaults"/>
     <cibtr:replace what="no_quorum_policy"
                    with="no-quorum-policy"/>
 
     <cibtr:replace what="notification-agent"
                    with=""
                    msg-extra="standalone alerts can be configured instead"/>
     <cibtr:replace what="notification-recipient"
                    with=""
                    msg-extra="standalone alerts can be configured instead"/>
 
     <cibtr:replace what="remove_after_stop"
                    with="remove-after-stop"/>
     <cibtr:replace what="shutdown_escalation"
                    with="shutdown-escalation"/>
     <cibtr:replace what="startup_fencing"
                    with="startup-fencing"/>
     <cibtr:replace what="stonith_action"
                    with="stonith-action"/>
     <cibtr:replace what="stonith_enabled"
                    with="stonith-enabled"/>
     <cibtr:replace what="stop_orphan_actions"
                    with="stop-orphan-actions"/>
     <cibtr:replace what="stop_orphan_resources"
                    with="stop-orphan-resources"/>
     <cibtr:replace what="symmetric_cluster"
                    with="symmetric-cluster"/>
     <cibtr:replace what="transition_idle_timeout"
                    with="cluster-delay"/>
   </cibtr:table>
 
   <!--
    Target tag:     node
    Object:         ./@*
    Selector ctxt:  ./@*
    Move ctxt:      N/A
    Related commit: 55ab749bf
    -->
   <cibtr:table for="cluster-node" msg-prefix="Cluster node">
     <cibtr:replace what="type"
                    with="type"
                    in-case-of="normal"
                    redefined-as="member"/>
   </cibtr:table>
 
   <!--
    Target tag:     primitive
                    template
    Object:         ./instance_attributes/nvpair/@name
    Selector ctxt:  N/A
    Move ctxt:      N/A
    Related commit: 06d4559cb
                    +
                    6c8e0be20
    -->
   <cibtr:table for="resource-instance-attributes" msg-prefix="Resource instance_attributes">
     <cibtr:replace what="pcmk_arg_map"
                    with=""/>
     <!-- simplified as pcmk_arg_map can encode multiple
          comma-separated pairs (everything would be dropped then,
          except for a single dangling case: "port" coming first) -->
     <cibtr:replace what="pcmk_arg_map"
                    with="pcmk_host_argument"
                    in-case-of-droppable-prefix="port:"/>
 
     <cibtr:replace what="pcmk_list_cmd"
                    with="pcmk_list_action"/>
     <cibtr:replace what="pcmk_monitor_cmd"
                    with="pcmk_monitor_action"/>
     <cibtr:replace what="pcmk_off_cmd"
                    with="pcmk_off_action"/>
     <cibtr:replace what="pcmk_on_cmd"
                    with="pcmk_on_action"/>
     <cibtr:replace what="pcmk_reboot_cmd"
                    with="pcmk_reboot_action"/>
     <cibtr:replace what="pcmk_status_cmd"
                    with="pcmk_status_action"/>
   </cibtr:table>
 
   <!--
    Target tag:     primitive
                    template
    Object:         ./meta_attributes/nvpair/@name
    Selector ctxt:  N/A
    Move ctxt:      N/A
    Related commit: c713bbe39
                    +
                    6052ad6da
    -->
   <cibtr:table for="resource-meta-attributes" msg-prefix="Resource meta_attributes">
     <cibtr:replace what="isolation"
                    with="target-role"
                    redefined-as="Stopped"
-                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"/>
+                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"
+                   msg-severity="WARNING"/>
     <cibtr:replace what="isolation-host"
                    with="target-role"
                    redefined-as="Stopped"
-                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"/>
+                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"
+                   msg-severity="WARNING"/>
     <cibtr:replace what="isolation-instance"
                    with="target-role"
                    redefined-as="Stopped"
-                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"/>
+                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"
+                   msg-severity="WARNING"/>
     <cibtr:replace what="isolation-wrapper"
                    with="target-role"
                    redefined-as="Stopped"
-                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"/>
+                   msg-extra="i.e. resource at hand disabled; isolation wrappers obsoleted with bundle resources"
+                   msg-severity="WARNING"/>
 
     <cibtr:replace what="resource-failure-stickiness"
                    with="migration-threshold"
                    in-case-of="-INFINITY"
                    redefined-as="1"/>
     <cibtr:replace what="resource-failure-stickiness"
                    with=""
                    msg-extra="migration-threshold can be configured instead"/>
     <cibtr:replace what="resource_failure_stickiness"
                    with="migration-threshold"
                    in-case-of="-INFINITY"
                    redefined-as="1"/>
     <cibtr:replace what="resource_failure_stickiness"
                    with=""
                    msg-extra="migration-threshold can be configured instead"/>
   </cibtr:table>
 
   <!--
    Target tag:     primitive
                    template
    Object:         ./operations/op/@*
                    ./operations/op/meta_attributes/nvpair/@name
                    ./operations/op/instance_attributes/nvpair/@name
    Selector ctxt:  ./operations/op/@name
    Move ctxt:      meta_attributes ~ ./meta_attributes/nvpair
    Related commit: 014a543d5
    -->
   <cibtr:table for="resources-operation" msg-prefix="Resources-operation"
                where-cases="meta_attributes">
     <!-- keep this in sync with resource-operation-instance-attributes table -->
     <cibtr:replace what="requires"
                    with=""
                    msg-extra="only start/promote operation taken into account"/>
     <cibtr:replace what="requires"
                    with="requires"
                    in-case-of="start|promote"
                    where="meta_attributes"/>
   </cibtr:table>
 
   <!--
    Target tag:     primitive
                    template
    Object:         ./operations/op/instance_attributes/nvpair/@name
    Selector ctxt:  ./operations/op/@name
    Move ctxt:      per-resource-meta_attributes ~ ./meta_attributes/nvpair
                    meta_attributes ~ ./operations/op/meta_attributes/nvpair
    Related commit: 023897afc
                    3100c0e8b
    -->
   <cibtr:table for="resource-operation-instance-attributes"
                msg-prefix="Resources-operation instance_attributes"
                where-cases="meta_attributes|per-resource-meta_attributes">
     <!-- this is easier to solve through resources-operation table handling,
          in the inverse mode, but for compatibility purposes, we need to have
          it tracked here, so mark it the same way as if we were moving it over
          to sibling per-op meta_attributes (while in fact we move it up to
          per-resource meta_attributes, as if it was specified in per-op
          meta_attributes already), just use a dedicated "where-case" other
          than "meta_attributes" reserved for proper local move as mentioned;
          otherwise keep it in sync with said table -->
     <cibtr:replace what="requires"
                    with=""
                    msg-extra="only start/promote operation taken into account"/>
     <cibtr:replace what="requires"
                    with="requires"
                    in-case-of="start|promote"
                    where="per-resource-meta_attributes"/>
 
     <!-- these must have been, due to the value sourcing predence arrangement,
          shadowed by immediate op's attributes, so simply preserve their
          non-meta meaning -->
     <!--
     <cibtr:replace what="name"
                    with="name"
                    where="meta_attributes"/>
     <cibtr:replace what="interval"
                    with="interval"
                    where="meta_attributes"/>
     -->
 
     <cibtr:replace what="interval-origin"
                    with="interval-origin"
                    where="meta_attributes"/>
     <cibtr:replace what="start-delay"
                    with="start-delay"
                    where="meta_attributes"/>
 
     <cibtr:replace what="enabled"
                    with="enabled"
                    where="meta_attributes"/>
     <cibtr:replace what="on-fail"
                    with="on-fail"
                    where="meta_attributes"/>
     <cibtr:replace what="record-pending"
                    with="record-pending"
                    where="meta_attributes"/>
     <cibtr:replace what="role"
                    with="role"
                    where="meta_attributes"/>
     <cibtr:replace what="timeout"
                    with="timeout"
                    where="meta_attributes"/>
   </cibtr:table>
 
   <!--
    Target tag:     rsc_colocation
    Object:         ./@*
    Selector ctxt:  N/A
    Move ctxt:      N/A
    Related commit: 96d7ffedf
    -->
   <cibtr:table for="constraints-colocation" msg-prefix="Constraints-colocation">
     <cibtr:replace what="score-attribute"
                    with=""
                    msg-extra="was actually never in effect"/>
     <cibtr:replace what="score-attribute-mangle"
                    with=""
                    msg-extra="was actually never in effect"/>
   </cibtr:table>
 
 </cibtr:map>
 
 <xsl:variable name="cibtr:MapClusterProperties"
               select="document('')/xsl:stylesheet
                         /cibtr:map/cibtr:table[
                           @for = 'cluster-properties'
                         ]"/>
 
 <xsl:variable name="cibtr:MapClusterNode"
               select="document('')/xsl:stylesheet
                         /cibtr:map/cibtr:table[
                           @for = 'cluster-node'
                         ]"/>
 
 <xsl:variable name="cibtr:MapResourceInstanceAttributes"
               select="document('')/xsl:stylesheet
                         /cibtr:map/cibtr:table[
                           @for = 'resource-instance-attributes'
                         ]"/>
 
 <xsl:variable name="cibtr:MapResourceMetaAttributes"
               select="document('')/xsl:stylesheet
                         /cibtr:map/cibtr:table[
                           @for = 'resource-meta-attributes'
                         ]"/>
 
 <xsl:variable name="cibtr:MapResourcesOperation"
               select="document('')/xsl:stylesheet
                         /cibtr:map/cibtr:table[
                           @for = 'resources-operation'
                         ]"/>
 
 <xsl:variable name="cibtr:MapResourcesOperationInstanceAttributes"
               select="document('')/xsl:stylesheet
                         /cibtr:map/cibtr:table[
                           @for = 'resource-operation-instance-attributes'
                         ]"/>
 
 <xsl:variable name="cibtr:MapConstraintsColocation"
               select="document('')/xsl:stylesheet
                         /cibtr:map/cibtr:table[
                           @for = 'constraints-colocation'
                         ]"/>
 
 <!--
 
  GENERIC UTILITIES
 
  -->
 
 <!--
  Plain identity template
 
  Merely implicit-context-driven, no arguments.
  -->
 <xsl:template name="cibtr:HelperIdentity">
   <xsl:copy>
     <xsl:apply-templates select="@*|node()"
                          mode="cibtr:main"/>
   </xsl:copy>
 </xsl:template>
 
 <!--
  Emit an message about the replacement, sanity checking the source definitions
 
  Merely parameter driven, no implicit context taken into account:
  - Context: optional message prefix
  - Replacement: selected subset of cibtr:map's leaves
                 (it's considered a hard error if consists of more than 1 item)
+
+ Explanation wrt. how target severity gets selected, ordered by priority:
+ - $Replacement/@msg-severity (WARNING/INFO/DEBUG)
+ - $Replacement/@msg-extra defined -> INFO
+ - otherwise -> DEBUG
  -->
 <xsl:template name="cibtr:MapMsg">
   <xsl:param name="Context" select="''"/>
   <xsl:param name="Replacement"/>
   <xsl:choose>
     <xsl:when test="not($Replacement)"/>
     <xsl:when test="count($Replacement) != 1">
       <xsl:message terminate="yes">
-        <xsl:value-of select="concat('INTERNAL ERROR:',
+        <xsl:value-of select="concat('INTERNAL ERROR: ',
                                      $Replacement/../@msg-prefix,
                                      ': count($Replacement) != 1',
                                      ' does not hold (',
                                      count($Replacement), ')')"/>
       </xsl:message>
     </xsl:when>
     <xsl:otherwise>
       <xsl:variable name="MsgPrefix" select="concat(
                                                ($Replacement|$Replacement/..)
                                                  /@msg-prefix, ': '
                                              )"/>
-      <xsl:message>
-        <xsl:value-of select="$MsgPrefix"/>
-        <xsl:if test="$Context">
-          <xsl:value-of select="concat($Context, ': ')"/>
-        </xsl:if>
+      <xsl:variable name="MsgSeverity">
         <xsl:choose>
-          <xsl:when test="string($Replacement/@with)">
-            <xsl:choose>
-              <xsl:when test="string($Replacement/@where)">
-                <xsl:if test="not(
-                                contains(
-                                  concat('|', $Replacement/../@where-cases, '|'),
-                                  concat('|', $Replacement/@where, '|')
-                                )
-                              )">
-                  <xsl:message terminate="yes">
-                    <xsl:value-of select="concat('INTERNAL ERROR:',
-                                                 $Replacement/../@msg-prefix,
-                                                 ': $Replacement/@where (',
-                                                 $Replacement/@where, ') not in ',
-                                                 concat('|',
-                                                 $Replacement/../@where-cases,
-                                                 '|'))"/>
-                  </xsl:message>
-                </xsl:if>
-                <xsl:value-of select="concat('moving ', $Replacement/@what,
-                                             ' under ', $Replacement/@where)"/>
-              </xsl:when>
-              <xsl:when test="$Replacement/@with = $Replacement/@what">
-                <xsl:value-of select="concat('keeping ', $Replacement/@what)"/>
-              </xsl:when>
-              <xsl:otherwise>
-                <xsl:value-of select="concat('renaming ', $Replacement/@what)"/>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:value-of select="concat(' as ', $Replacement/@with)"/>
-            <xsl:if test="$Replacement/@where">
-              <xsl:value-of select="' unless already defined there'"/>
-            </xsl:if>
+          <xsl:when test="$Replacement/@msg-severity">
+            <xsl:value-of select="$Replacement/@msg-severity"/>
+          </xsl:when>
+          <xsl:when test="$Replacement/@msg-extra">
+            <xsl:value-of select="'INFO'"/>
           </xsl:when>
           <xsl:otherwise>
-            <xsl:value-of select="concat('dropping ', $Replacement/@what)"/>
+            <xsl:value-of select="'DEBUG'"/>
           </xsl:otherwise>
         </xsl:choose>
-        <xsl:if test="string($Replacement/@redefined-as)">
-          <xsl:value-of select="concat(', redefined as ',
-                                       $Replacement/@redefined-as)"/>
-          <xsl:if test="$Replacement/@in-case-of">
-            <xsl:value-of select="','"/>
-          </xsl:if>
-        </xsl:if>
+      </xsl:variable>
+      <xsl:variable name="MsgSeverityLabel">
         <xsl:choose>
-          <xsl:when test="string($Replacement/@in-case-of)">
-            <xsl:value-of select="concat(' for matching ',
-                                         $Replacement/@in-case-of)"/>
+          <xsl:when test="$MsgSeverity = 'WARNING'">
+            <xsl:value-of select="$cibtr:label-warning"/>
           </xsl:when>
-          <xsl:when test="$Replacement/@in-case-of">
-            <xsl:value-of select="' for matching &quot;empty string&quot;'"/>
+          <xsl:when test="$MsgSeverity = 'INFO'">
+            <xsl:value-of select="$cibtr:label-info"/>
           </xsl:when>
-          <xsl:when test="$Replacement/@in-case-of-droppable-prefix">
-            <xsl:value-of select="concat(' for matching ',
-                                    $Replacement/@in-case-of-droppable-prefix,
-                                    ' prefix that will, meanwhile, get dropped'
-                                  )"/>
+          <xsl:when test="$MsgSeverity = 'DEBUG'">
+            <xsl:value-of select="$cibtr:label-debug"/>
           </xsl:when>
+          <xsl:otherwise>
+            <xsl:message terminate="yes">
+              <xsl:value-of select="concat('INTERNAL ERROR: not a valid',
+                                           ' severity specification: ',
+                                           $MsgSeverity)"/>
+            </xsl:message>
+          </xsl:otherwise>
         </xsl:choose>
-      </xsl:message>
-      <xsl:if test="$Replacement/@msg-extra">
+      </xsl:variable>
+      <xsl:if test="string($MsgSeverityLabel) != string(false())">
         <xsl:message>
-          <xsl:value-of select="concat($MsgPrefix, '... ',
-                                       $Replacement/@msg-extra)"/>
+          <xsl:value-of select="concat($MsgSeverityLabel, $MsgPrefix)"/>
+          <xsl:if test="$Context">
+            <xsl:value-of select="concat($Context, ': ')"/>
+          </xsl:if>
+          <xsl:choose>
+            <xsl:when test="string($Replacement/@with)">
+              <xsl:choose>
+                <xsl:when test="string($Replacement/@where)">
+                  <xsl:if test="not(
+                                  contains(
+                                    concat('|', $Replacement/../@where-cases, '|'),
+                                    concat('|', $Replacement/@where, '|')
+                                  )
+                                )">
+                    <xsl:message terminate="yes">
+                      <xsl:value-of select="concat('INTERNAL ERROR:',
+                                                   $Replacement/../@msg-prefix,
+                                                   ': $Replacement/@where (',
+                                                   $Replacement/@where, ') not in ',
+                                                   concat('|',
+                                                   $Replacement/../@where-cases,
+                                                   '|'))"/>
+                    </xsl:message>
+                  </xsl:if>
+                  <xsl:value-of select="concat('moving ', $Replacement/@what,
+                                               ' under ', $Replacement/@where)"/>
+                </xsl:when>
+                <xsl:when test="$Replacement/@with = $Replacement/@what">
+                  <xsl:value-of select="concat('keeping ', $Replacement/@what)"/>
+                </xsl:when>
+                <xsl:otherwise>
+                  <xsl:value-of select="concat('renaming ', $Replacement/@what)"/>
+                </xsl:otherwise>
+              </xsl:choose>
+              <xsl:value-of select="concat(' as ', $Replacement/@with)"/>
+              <xsl:if test="$Replacement/@where">
+                <xsl:value-of select="' unless already defined there'"/>
+              </xsl:if>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="concat('dropping ', $Replacement/@what)"/>
+            </xsl:otherwise>
+          </xsl:choose>
+          <xsl:if test="string($Replacement/@redefined-as)">
+            <xsl:value-of select="concat(', redefined as ',
+                                         $Replacement/@redefined-as)"/>
+            <xsl:if test="$Replacement/@in-case-of">
+              <xsl:value-of select="','"/>
+            </xsl:if>
+          </xsl:if>
+          <xsl:choose>
+            <xsl:when test="string($Replacement/@in-case-of)">
+              <xsl:value-of select="concat(' for matching ',
+                                           $Replacement/@in-case-of)"/>
+            </xsl:when>
+            <xsl:when test="$Replacement/@in-case-of">
+              <xsl:value-of select="' for matching &quot;empty string&quot;'"/>
+            </xsl:when>
+            <xsl:when test="$Replacement/@in-case-of-droppable-prefix">
+              <xsl:value-of select="concat(' for matching ',
+                                      $Replacement/@in-case-of-droppable-prefix,
+                                      ' prefix that will, meanwhile, get dropped'
+                                    )"/>
+            </xsl:when>
+          </xsl:choose>
         </xsl:message>
+        <xsl:if test="$Replacement/@msg-extra">
+          <xsl:message>
+            <xsl:value-of select="concat($MsgSeverityLabel, $MsgPrefix, '... ',
+                                         $Replacement/@msg-extra)"/>
+          </xsl:message>
+        </xsl:if>
       </xsl:if>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
 <!--
  Produce a denormalized space if not present in the input (cf. trick A.)
 
  Merely parameter driven, no implicit context taken into account:
  - Source: input selection or result tree fragment to evaluate
  - ResultTreeFragment: optional self-explanatory flag related to Source
  -->
 <xsl:template name="cibtr:HelperDenormalizedSpace">
   <xsl:param name="Source"/>
   <xsl:param name="ResultTreeFragment" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:choose>
     <xsl:when test="not($ResultTreeFragment)">
       <!-- intention here is that immediately surrounding text (mostly expected
            to be just indenting whitespace) and comments will be preserved;
            in case no denormalized space is present, " " is injected -->
       <xsl:variable name="ExistingSpace"
                     select="$Source/preceding-sibling::node()[
                               (
                                 self::comment()
                                 or
                                 self::text()
                               )
                               and
                               generate-id(following-sibling::*[1])
                               = generate-id($Source)
                             ]"/>
       <xsl:copy-of select="$ExistingSpace"/>
       <xsl:if test="not(
                       $ExistingSpace/self::text()[
                         normalize-space(.) != string(.)
                       ]
                     ) and $InnerSimulation">
         <xsl:text> </xsl:text>
       </xsl:if>
     </xsl:when>
     <xsl:when test="normalize-space($Source)
                     != string($Source)">
       <xsl:text> </xsl:text>
     </xsl:when>
   </xsl:choose>
 </xsl:template>
 
 <!--
 
  TRANSFORMATION HELPERS
 
  considerations, limitations, etc.:
  1. the transformations tries to preserve as much of the original XML
     as possible, incl. whitespace text/indentation and comments, but
     at times (corner cases of tricks A. + B. below), this needs to be
     sacrificed, e.g., distorting nice indentation, hence if the
     perfection is the goal:
     - user of the transformation can feed the minimized version of
       the XML (no denormalized/any white-space present)
     - user of the transformation can (re-)pretty-print the outcome
       afterwards
 
  tricks and conventions used:
  A. callable templates only return Result Tree Fragments, which means
     the only operations allowed are those looking at the underlying,
     virtual node-set, and since we need to discern their non-void
     production (i.e. on successful match/es), we use this trick:
     - ensure the template will not propagate any denormalized whitespace
     - inject denormalized whitespace (superfluous space) artificially
       to mark successful production (but see B. below)
     - with the template production, here stored as Var variable,
       we test "normalize-space($Var) != $Var" condition to detect
       non-void production, mainly intended to see whether to emit
       the enclosing element at all (with the goal of not leaving
       superfluous elements behind needlessly)
  B. [extension over A.] to eliminate distorted indentation
     (cf. consideration 1.), additional reuse of these callable
     templates is introduced: the template can recursively call
     itself with a special flag (InnerSimulation) as an oracle to
     see to whether non-void production will ensue (all pre-existing
     denormalized whitespace is forcefully removed in this mode),
     and if positive, all such inner pre-existing whitespace is
     then preserved in this outer=main invocation
  C. [extension over B.] when checking the non-void production
     (via InnerSimulation), beside the injected denormalized whitespace,
     we can also inject particular strings, which the callsite of such
     simulation can, in addition, inspect for paricular string
     occurrences, e.g. to prevent clashes on the production coming
     from multiple sources
  D. not only to honour DRY principle and to avoid inner entropy, it's
     often useful to make callable template bimodal, e.g., when the
     production is generated in the "what's to stay in place" vs.
     "what's to be propagated (combined with previous, effectively
     moved) at this other part of the tree" contexts; for such cases,
     there's usually InverseMode parameter to be assigned true()
     (implicit default) and false(), respectively
  E. the common idiom that emerges is: evaluate simulation value,
     depending on the presence of the "success mark" (cf. A.),
     possibly emit non-simulation value; since it would (likely)
     re-evaluate the simulation anew (wastefully) or perhaps
     this sort of dependency injection can just come handy,
     common transformation helpers below offer InnerPass
     parameter to be optionally passed, either as a string (when
     no-denormalized-space is an internal criterium for the template)
     or, conventionally, the result tree fragment representing the
     output of the template at hand called with a simulation flag
     * established signaling strings accompanying InnerSimulation=true:
       - TRIGGER-MSG ... make the template execution emit messages
                         describing changes being performed
       - TRIGGER-RECURSION
                     ... currently used in the oracle-like evaluation
                         of what's the situation with the sibling
                         elements as a recursion guard so that such
                         nested runs won't revisit the new set of
                         siblings per the respective nested context
 
  -->
 
 <!--
  Source ctxt:    cluster_property_set
  Target ctxt:    cluster_property_set
  Target-inv ctxt:/cib/configuration/(op_defaults|rsc_defaults)
                  [cluster_property_set -> meta_attributes]
  Dependencies:   N/A
  -->
 <xsl:template name="cibtr:ProcessClusterProperties">
   <xsl:param name="Source"/>
   <xsl:param name="InverseMode" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:ProcessClusterProperties">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InverseMode" select="$InverseMode"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:param>
 
   <xsl:for-each select="$Source/node()">
     <xsl:choose>
       <xsl:when test="self::text()">
         <!-- cf. trick A. (consideration 1.) -->
         <xsl:choose>
           <xsl:when test="normalize-space($InnerPass)
                           != $InnerPass
                           and
                           (
                             not(following-sibling::nvpair)
                             or
                             generate-id(following-sibling::nvpair[1])
                             != generate-id(following-sibling::*[1])
                           )">
             <xsl:value-of select="."/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="normalize-space(.)"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:when test="self::nvpair">
         <xsl:variable name="Replacement"
                       select="$cibtr:MapClusterProperties/cibtr:replace[
                                 @what = current()/@name
                                 and
                                 (
                                   (
                                     @in-case-of
                                     and
                                     contains(concat('|', @in-case-of, '|'),
                                              concat('|', current()/@value, '|'))
                                   )
                                   or
                                   (
                                     not(@in-case-of)
                                     and
                                     not(
                                       $cibtr:MapClusterProperties/cibtr:replace[
                                         @what = current()/@name
                                         and
                                         @in-case-of
                                         and
                                         contains(concat('|', @in-case-of, '|'),
                                                  concat('|', current()/@value, '|'))
                                       ]
                                     )
                                   )
                                 )
                               ]"/>
         <xsl:if test="$InnerPass = 'TRIGGER-MSG'">
           <xsl:call-template name="cibtr:MapMsg">
             <xsl:with-param name="Context" select="@id"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>
           </xsl:call-template>
         </xsl:if>
         <xsl:choose>
           <xsl:when test="$Replacement
                           and
                           (
                             not(string($Replacement/@with))
                             or
                             $Replacement/@where
                           )">
             <!-- drop (possibly just move over) -->
             <xsl:if test="$Replacement/@where
                           and
                           (
                             (
                               normalize-space($InverseMode)
                               and
                               $Replacement/@where = $InverseMode
                             )
                             or
                             (
                               not(normalize-space($InverseMode))
                               and
                               (true() or count($InverseMode))
                               and
                               not(
                                 $InverseMode/nvpair[
                                   @name = $Replacement/@with
                                 ]
                               )
                               and
                               $Replacement/@where = name($InverseMode/..)
                             )
                           )">
               <xsl:call-template name="cibtr:HelperDenormalizedSpace">
                 <xsl:with-param name="Source" select="."/>
                 <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
               </xsl:call-template>
               <xsl:copy>
                 <xsl:for-each select="@*">
                   <xsl:choose>
                     <xsl:when test="name() = 'name'">
                       <xsl:attribute name="{name()}">
                         <xsl:value-of select="$Replacement/@with"/>
                       </xsl:attribute>
                     </xsl:when>
                     <xsl:when test="string($Replacement/@redefined-as)
                                     and
                                     name() = 'value'">
                       <xsl:attribute name="{name()}">
                         <xsl:value-of select="$Replacement/@redefined-as"/>
                       </xsl:attribute>
                     </xsl:when>
                     <xsl:otherwise>
                       <xsl:copy/>
                     </xsl:otherwise>
                   </xsl:choose>
                 </xsl:for-each>
               </xsl:copy>
             </xsl:if>
           </xsl:when>
           <xsl:when test="$InverseMode"/>
           <xsl:when test="$Replacement">
             <xsl:call-template name="cibtr:HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:copy>
               <xsl:for-each select="@*">
                 <xsl:choose>
                   <xsl:when test="name() = 'name'">
                     <xsl:attribute name="{name()}">
                       <xsl:value-of select="$Replacement/@with"/>
                     </xsl:attribute>
                   </xsl:when>
                   <xsl:when test="string($Replacement/@redefined-as)
                                   and
                                   name() = 'value'">
                     <xsl:attribute name="{name()}">
                       <xsl:value-of select="$Replacement/@redefined-as"/>
                     </xsl:attribute>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:copy/>
                   </xsl:otherwise>
                 </xsl:choose>
               </xsl:for-each>
             </xsl:copy>
           </xsl:when>
           <xsl:otherwise>
             <xsl:call-template name="cibtr:HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:call-template name="cibtr:HelperIdentity"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:when test="$InverseMode
                       or
                       self::comment()">
         <!-- drop -->
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:HelperIdentity"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:for-each>
 </xsl:template>
 
 <!--
  Source ctxt:    (primitive|template)/instance_attributes
  Target ctxt:    (primitive|template)/instance_attributes
  Target-inv ctxt:N/A
  Dependencies:   N/A
  -->
 <xsl:template name="cibtr:ProcessRscInstanceAttributes">
   <xsl:param name="Source"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:ProcessRscInstanceAttributes">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:param>
 
   <!-- B: special-casing nvpair -->
   <xsl:for-each select="$Source/node()">
     <xsl:choose>
       <xsl:when test="self::text()">
         <!-- cf. trick A. (consideration 1.) -->
         <xsl:choose>
           <xsl:when test="normalize-space($InnerPass)
                           != $InnerPass
                           and
                           (
                             not(following-sibling::nvpair)
                             or
                             generate-id(following-sibling::nvpair[1])
                             != generate-id(following-sibling::*[1])
                           )">
             <xsl:value-of select="."/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="normalize-space(.)"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:when test="self::nvpair">
         <xsl:variable name="Replacement"
                       select="$cibtr:MapResourceInstanceAttributes/cibtr:replace[
                                 @what = current()/@name
                                 and
                                 (
                                   (
                                     @in-case-of
                                     and
                                     contains(concat('|', @in-case-of, '|'),
                                              concat('|', current()/@value, '|'))
                                   )
                                   or
                                   (
                                     @in-case-of-droppable-prefix
                                     and
                                     starts-with(current()/@value,
                                                 @in-case-of-droppable-prefix)
                                     and
                                     not(
                                       contains(current()/@value, ',')
                                     )
                                   )
                                   or
                                   (
                                     not(@in-case-of)
                                     and
                                     not(@in-case-of-droppable-prefix)
                                     and
                                     not(
                                       $cibtr:MapResourceInstanceAttributes/cibtr:replace[
                                         @what = current()/@name
                                         and
                                         (
                                           (
                                             @in-case-of
                                             and
                                             contains(concat('|', @in-case-of, '|'),
                                                      concat('|', current()/@value, '|'))
                                           )
                                           or
                                           (
                                             @in-case-of-droppable-prefix
                                             and
                                             starts-with(current()/@value,
                                                         @in-case-of-droppable-prefix)
                                             and
                                             not(
                                               contains(current()/@value, ',')
                                             )
                                           )
                                         )
                                       ]
                                     )
                                   )
                                 )
                               ]"/>
         <xsl:if test="$InnerPass = 'TRIGGER-MSG'">
           <xsl:call-template name="cibtr:MapMsg">
             <xsl:with-param name="Context" select="@id"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>
           </xsl:call-template>
         </xsl:if>
         <xsl:choose>
           <xsl:when test="$Replacement
                           and
                           not(string($Replacement/@with))">
             <!-- drop (move-over code missing) -->
           </xsl:when>
           <xsl:when test="$Replacement">
             <!-- plain rename -->
             <xsl:call-template name="cibtr:HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:copy>
               <xsl:for-each select="@*">
                 <xsl:choose>
                   <xsl:when test="name() = 'name'">
                     <xsl:attribute name="{name()}">
                       <xsl:value-of select="$Replacement/@with"/>
                     </xsl:attribute>
                   </xsl:when>
                   <xsl:when test="string($Replacement/@redefined-as)
                                   and
                                   name() = 'value'">
                     <xsl:attribute name="{name()}">
                       <xsl:value-of select="$Replacement/@redefined-as"/>
                     </xsl:attribute>
                   </xsl:when>
                   <xsl:when test="string($Replacement/@in-case-of-droppable-prefix)
                                   and
                                   name() = 'value'">
                     <xsl:attribute name="{name()}">
                       <xsl:value-of select="substring-after(
                                               ., $Replacement/@in-case-of-droppable-prefix
                                             )"/>
                     </xsl:attribute>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:copy/>
                   </xsl:otherwise>
                 </xsl:choose>
               </xsl:for-each>
             </xsl:copy>
           </xsl:when>
           <xsl:otherwise>
             <xsl:call-template name="cibtr:HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:call-template name="cibtr:HelperIdentity"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:HelperIdentity"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:for-each>
   <!-- E: special-casing nvpair -->
 </xsl:template>
 
 <!--
  Source ctxt:    (primitive|template)/meta_attributes
  Target ctxt:    (primitive|template)/meta_attributes
  Target-inv ctxt:N/A
  Dependencies:   N/A
  -->
 <xsl:template name="cibtr:ProcessRscMetaAttributes">
   <xsl:param name="Source"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:ProcessRscMetaAttributes">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:param>
 
   <!-- B: special-casing nvpair -->
   <xsl:for-each select="$Source/node()">
     <xsl:choose>
       <xsl:when test="self::text()">
         <!-- cf. trick A. (consideration 1.) -->
         <xsl:choose>
           <xsl:when test="normalize-space($InnerPass)
                           != $InnerPass
                           and
                           (
                             not(following-sibling::nvpair)
                             or
                             generate-id(following-sibling::nvpair[1])
                             != generate-id(following-sibling::*[1])
                           )">
             <xsl:value-of select="."/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="normalize-space(.)"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:when test="self::nvpair">
         <xsl:variable name="Replacement"
                       select="$cibtr:MapResourceMetaAttributes/cibtr:replace[
                                 @what = current()/@name
                                 and
                                 (
                                   (
                                     @in-case-of
                                     and
                                     contains(concat('|', @in-case-of, '|'),
                                              concat('|', current()/@value, '|'))
                                   )
                                   or
                                   (
                                     not(@in-case-of)
                                     and
                                     not(
                                       $cibtr:MapResourceMetaAttributes/cibtr:replace[
                                         @what = current()/@name
                                         and
                                         (
                                           @in-case-of
                                           and
                                           contains(concat('|', @in-case-of, '|'),
                                                    concat('|', current()/@value, '|'))
                                         )
                                       ]
                                     )
                                   )
                                 )
                               ]"/>
         <xsl:if test="$InnerPass = 'TRIGGER-MSG'">
           <xsl:call-template name="cibtr:MapMsg">
             <xsl:with-param name="Context"
                             select="concat(../../@id,
                                            ' (meta=', ../@id,
                                            ')')"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>
           </xsl:call-template>
         </xsl:if>
         <xsl:choose>
           <xsl:when test="$Replacement
                           and
                           not(string($Replacement/@with))">
             <!-- drop (move-over code missing) -->
           </xsl:when>
           <xsl:when test="$Replacement">
             <!-- plain rename -->
             <xsl:variable name="SimulateFollowingSiblings">
               <!-- prevent generating redundant name-value pairs -->
               <xsl:for-each select="(..|../following-sibling::meta_attributes)[
                                       not(rule)
                                     ]">
                 <xsl:if test="$InnerPass != 'TRIGGER-RECURSION'">
                   <xsl:call-template name="cibtr:ProcessRscMetaAttributes">
                     <xsl:with-param name="Source" select="."/>
                     <xsl:with-param name="InnerSimulation" select="true()"/>
                     <xsl:with-param name="InnerPass" select="'TRIGGER-RECURSION'"/>
                   </xsl:call-template>
                 </xsl:if>
               </xsl:for-each>
             </xsl:variable>
             <xsl:choose>
               <!-- instead of HelperDenormalizedSpace -->
               <xsl:when test="$InnerSimulation">
                 <xsl:value-of select="concat(generate-id(), '@', $Replacement/@with, ' ')"/>
               </xsl:when>
               <xsl:otherwise>
                 <xsl:if test="not(
                                 contains($SimulateFollowingSiblings,
                                          concat($Replacement/@with, ' '))
                               )
                               or
                               generate-id()
                               =
                               substring-before($SimulateFollowingSiblings,
                                                concat('@', $Replacement/@with))">
                   <xsl:call-template name="cibtr:HelperDenormalizedSpace">
                     <xsl:with-param name="Source" select="."/>
                     <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
                   </xsl:call-template>
                   <xsl:copy>
                     <xsl:for-each select="@*">
                       <xsl:choose>
                         <xsl:when test="name() = 'name'">
                           <xsl:attribute name="{name()}">
                             <xsl:value-of select="$Replacement/@with"/>
                           </xsl:attribute>
                         </xsl:when>
                         <xsl:when test="string($Replacement/@redefined-as)
                                         and
                                         name() = 'value'">
                           <xsl:attribute name="{name()}">
                             <xsl:value-of select="$Replacement/@redefined-as"/>
                           </xsl:attribute>
                         </xsl:when>
                         <xsl:otherwise>
                           <xsl:copy/>
                         </xsl:otherwise>
                       </xsl:choose>
                     </xsl:for-each>
                   </xsl:copy>
                 </xsl:if>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:when>
           <xsl:otherwise>
             <xsl:call-template name="cibtr:HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:call-template name="cibtr:HelperIdentity"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:HelperIdentity"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:for-each>
   <!-- E: special-casing nvpair -->
 </xsl:template>
 
 <!--
  Source ctxt:    (primitive|template)/operations/op/instance_attributes
  Target ctxt:    (primitive|template)/operations/op/instance_attributes
  Target-inv ctxt:(primitive|template)/operations/op/meta_attributes
  Dependencies:   ProcessNonattrOpMetaAttributes [inverse only]
  -->
 <xsl:template name="cibtr:ProcessOpInstanceAttributes">
   <xsl:param name="Source"/>
   <xsl:param name="InverseMode" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:ProcessOpInstanceAttributes">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:param>
 
   <xsl:variable name="EnclosingTag" select="../../.."/>
 
   <!-- B: special-casing nvpair -->
   <xsl:for-each select="$Source/node()">
     <xsl:choose>
       <xsl:when test="self::text()">
         <!-- cf. trick A. (consideration 1.) -->
         <xsl:choose>
           <xsl:when test="normalize-space($InnerPass)
                           != $InnerPass
                           and
                           (
                             not(following-sibling::nvpair)
                             or
                             generate-id(following-sibling::nvpair[1])
                             != generate-id(following-sibling::*[1])
                           )">
             <xsl:value-of select="."/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="normalize-space(.)"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:when test="self::nvpair">
         <xsl:variable name="Replacement"
                       select="$cibtr:MapResourcesOperationInstanceAttributes/cibtr:replace[
                                 @what = current()/@name
                                 and
                                 (
                                   (
                                     @in-case-of
                                     and
                                     contains(concat('|', @in-case-of, '|'),
                                              concat('|', current()/../../@name, '|'))
                                   )
                                   or
                                   (
                                     not(@in-case-of)
                                     and
                                     not(
                                       $cibtr:MapResourcesOperationInstanceAttributes/cibtr:replace[
                                         @what = current()/@name
                                         and
                                         @in-case-of
                                         and
                                         contains(concat('|', @in-case-of, '|'),
                                                  concat('|', current()/../../@name, '|'))
                                       ]
                                     )
                                   )
                                 )
                               ]"/>
         <xsl:if test="$InnerPass = 'TRIGGER-MSG'">
           <xsl:call-template name="cibtr:MapMsg">
             <xsl:with-param name="Context"
                             select="concat(../../@id,
                                            ' (rsc=', $EnclosingTag/@id,
                                            ', meta=', ../@id,
                                            ')')"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>
           </xsl:call-template>
         </xsl:if>
         <xsl:choose>
           <xsl:when test="$Replacement
                           and
                           (
                             not(string($Replacement/@with))
                             or
                             $Replacement/@where
                           )">
             <!-- drop (possibly just move over) -->
             <xsl:variable name="SimulateAttrOverrides">
               <xsl:for-each select="../../../op">
                 <xsl:call-template name="cibtr:ProcessAttrOpMetaAttributes">
                   <xsl:with-param name="Source" select="."/>
                   <xsl:with-param name="InverseMode" select="true()"/>
                   <xsl:with-param name="InnerSimulation" select="true()"/>
                 </xsl:call-template>
               </xsl:for-each>
             </xsl:variable>
             <xsl:if test="$InverseMode
                           and
                           not(
                             contains($SimulateAttrOverrides,
                                      concat(@name, ' '))
                           )">
               <!-- do not override; do not collide with:
                    - newly added from op/@* (see last condition above)
                    - existing - actually subsumed with the previous point
                    - successors sourced like this (see below) -->
               <xsl:variable name="SimulateFollowingSiblingsMeta">
                 <!-- cf. similar handling in ProcessAttrOpMetaAttributes,
                      but this is more convoluted -->
                 <xsl:for-each select="(../following-sibling::meta_attributes
                                        |../../following-sibling::op/meta_attributes)[
                                         not(rule)
                                       ]">
                   <xsl:call-template name="cibtr:ProcessNonattrOpMetaAttributes">
                     <xsl:with-param name="Source" select="."/>
                     <xsl:with-param name="InverseMode" select="true()"/>
                     <xsl:with-param name="InnerSimulation" select="true()"/>
                   </xsl:call-template>
                 </xsl:for-each>
               </xsl:variable>
               <xsl:variable name="SimulateFollowingSiblingsInstance">
                 <xsl:for-each select="../following-sibling::instance_attributes[
                                         not(rule)
                                       ]">
                   <xsl:call-template name="cibtr:ProcessOpInstanceAttributes">
                     <xsl:with-param name="Source" select="."/>
                     <xsl:with-param name="InverseMode" select="true()"/>
                     <xsl:with-param name="InnerSimulation" select="true()"/>
                   </xsl:call-template>
                 </xsl:for-each>
               </xsl:variable>
               <xsl:if test="$Replacement/@where = 'meta_attributes'
                             and
                             not(
                               $EnclosingTag/meta_attributes[
                                 not(rule)
                                 and
                                 nvpair/@name = $Replacement/@with
                               ]
                             )
                             and
                             not(
                               contains($SimulateFollowingSiblingsInstance,
                                        concat(@name, ' '))
                             )">
                 <!-- cf. trick C. (indicate for inverse mode) -->
                 <xsl:choose>
                   <xsl:when test="$InnerSimulation">
                     <!-- instead of HelperDenormalizedSpace -->
                     <xsl:value-of select="concat(@name, ' ')"/>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:call-template name="cibtr:HelperDenormalizedSpace">
                       <xsl:with-param name="Source" select="."/>
                       <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
                     </xsl:call-template>
                     <xsl:copy>
                       <xsl:apply-templates select="@*"
                                            mode="cibtr:main"/>
                     </xsl:copy>
                   </xsl:otherwise>
                 </xsl:choose>
               </xsl:if>
             </xsl:if>
           </xsl:when>
           <xsl:when test="$Replacement">
             <xsl:message terminate="yes">
               <xsl:value-of select="concat('INTERNAL ERROR: ',
                                            $Replacement/../@msg-prefix,
                                            ': no in-situ rename',
                                            ' does not hold (',
                                            not(($InverseMode)), ')')"/>
             </xsl:message>
           </xsl:when>
           <xsl:when test="$InverseMode"/>
           <xsl:otherwise>
             <xsl:call-template name="cibtr:HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:call-template name="cibtr:HelperIdentity"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:when test="$InverseMode
                       or
                       self::comment()">
         <!-- drop -->
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:HelperIdentity"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:for-each>
   <!-- E: special-casing nvpair -->
 </xsl:template>
 
 <!--
  Source ctxt:    (primitive|template)/operations/op/meta_attributes
                  (primitive|template)/operations/op/instance_attributes (inverse only)
  Target ctxt:    (primitive|template)/operations/op/meta_attributes
  Target-inv ctxt:(primitive|template)/meta_attributes
  Dependencies:   ProcessAttrOpMetaAttributes
                  ProcessNonattrOpMetaAttributes
  -->
 <xsl:template name="cibtr:ProcessNonattrOpMetaAttributes">
   <xsl:param name="Source"/>
   <xsl:param name="InverseMode" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:ProcessNonattrOpMetaAttributes">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:param>
 
   <xsl:variable name="EnclosingTag" select="../../.."/>
 
   <xsl:for-each select="$Source/node()">
     <xsl:choose>
       <xsl:when test="self::text()
                       and
                       not($InverseMode)">
         <!-- cf. trick A. (consideration 1.) -->
         <xsl:choose>
           <xsl:when test="normalize-space($InnerPass)
                           != $InnerPass
                           and
                           (
                             not(following-sibling::nvpair)
                             or
                             generate-id(following-sibling::nvpair[1])
                             != generate-id(following-sibling::*[1])
                           )">
             <xsl:value-of select="."/>
           </xsl:when>
           <xsl:otherwise>
             <xsl:value-of select="normalize-space(.)"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:when test="self::nvpair">
         <xsl:variable name="Replacement"
                       select="$cibtr:MapResourcesOperation/cibtr:replace[
                                 @what = current()/@name
                                 and
                                 (
                                   (
                                     @in-case-of
                                     and
                                     contains(concat('|', @in-case-of, '|'),
                                              concat('|', current()/../../@name, '|'))
                                   )
                                   or
                                   (
                                     not(@in-case-of)
                                     and
                                     not(
                                       $cibtr:MapResourcesOperation/cibtr:replace[
                                         @what = current()/@name
                                         and
                                         @in-case-of
                                         and
                                         contains(concat('|', @in-case-of, '|'),
                                                  concat('|', current()/../../@name, '|'))
                                       ]
                                     )
                                   )
                                 )
                               ]"/>
         <xsl:if test="$InnerPass = 'TRIGGER-MSG'">
           <xsl:call-template name="cibtr:MapMsg">
             <xsl:with-param name="Context"
                             select="concat(../../@id,
                                            ' (rsc=', $EnclosingTag/@id,
                                            ', meta=', ../@id,
                                            ')')"/>
             <xsl:with-param name="Replacement" select="$Replacement"/>
           </xsl:call-template>
         </xsl:if>
         <xsl:choose>
           <xsl:when test="$Replacement
                           and
                           (
                             not(string($Replacement/@with))
                             or
                             $Replacement/@where
                           )">
             <!-- drop (possibly just move over) -->
             <xsl:if test="$InverseMode">
               <xsl:variable name="SimulateAttrOverrides">
                 <xsl:for-each select="../../../op">
                   <xsl:call-template name="cibtr:ProcessAttrOpMetaAttributes">
                     <xsl:with-param name="Source" select="."/>
                     <xsl:with-param name="InverseMode" select="true()"/>
                     <xsl:with-param name="InnerSimulation" select="true()"/>
                   </xsl:call-template>
                 </xsl:for-each>
               </xsl:variable>
               <xsl:if test="not(
                               contains($SimulateAttrOverrides,
                                        concat(@name, ' '))
                             )">
                 <!-- do not override; do not collide with:
                      - newly added from op/@* (see last condition above)
                      - existing - actually subsumed with the previous point
                      - successors sourced like this (see below)
                      and if coming from op/instance_attributes, add also
                      - any meta_attributes sourced like this -->
                 <xsl:variable name="SimulateFollowingSiblings">
                   <!-- cf. similar handling in ProcessAttrOpMetaAttributes,
                        but this is more convoluted -->
                   <xsl:if test="name(..) = 'meta_attributes'">
                     <xsl:for-each select="(../following-sibling::meta_attributes
                                            |../../following-sibling::op/meta_attributes)[
                                             not(rule)
                                           ]">
                       <xsl:call-template name="cibtr:ProcessNonattrOpMetaAttributes">
                         <xsl:with-param name="Source" select="."/>
                         <xsl:with-param name="InverseMode" select="true()"/>
                         <xsl:with-param name="InnerSimulation" select="true()"/>
                       </xsl:call-template>
                     </xsl:for-each>
                   </xsl:if>
                   <xsl:if test="name(..) = 'instance_attributes'">
                     <xsl:for-each select="(../following-sibling::instance_attributes
                                            |../../following-sibling::op/instance_attributes
                                            |../../meta_attributes
                                            |../../../op/meta_attributes)[
                                             not(rule)
                                           ]">
                       <xsl:call-template name="cibtr:ProcessNonattrOpMetaAttributes">
                         <xsl:with-param name="Source" select="."/>
                         <xsl:with-param name="InverseMode" select="true()"/>
                         <xsl:with-param name="InnerSimulation" select="true()"/>
                       </xsl:call-template>
                     </xsl:for-each>
                   </xsl:if>
                 </xsl:variable>
                 <xsl:if test="$Replacement/@where = 'meta_attributes'
                               and
                               not(
                                 $EnclosingTag/meta_attributes[
                                   not(rule)
                                   and
                                   nvpair/@name = $Replacement/@with
                                 ]
                               )
                               and
                               not(
                                 contains($SimulateFollowingSiblings,
                                          concat(@name, ' '))
                               )">
                   <!-- cf. trick C. (indicate for inverse mode) -->
                   <xsl:choose>
                     <!-- instead of HelperDenormalizedSpace -->
                     <xsl:when test="$InnerSimulation">
                       <xsl:value-of select="concat(@name, ' ')"/>
                     </xsl:when>
                     <xsl:otherwise>
                       <xsl:copy>
                         <xsl:apply-templates select="@*"
                                              mode="cibtr:main"/>
                       </xsl:copy>
                     </xsl:otherwise>
                   </xsl:choose>
                 </xsl:if>
               </xsl:if>
             </xsl:if>
           </xsl:when>
           <xsl:when test="$Replacement">
             <xsl:message terminate="yes">
               <xsl:value-of select="concat('INTERNAL ERROR: ',
                                            $Replacement/../@msg-prefix,
                                            ': no in-situ rename',
                                            ' does not hold (',
                                            not(($InverseMode)), ')')"/>
             </xsl:message>
           </xsl:when>
           <xsl:when test="$InverseMode"/>
           <xsl:otherwise>
             <xsl:call-template name="cibtr:HelperDenormalizedSpace">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
             </xsl:call-template>
             <xsl:call-template name="cibtr:HelperIdentity"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:when>
       <xsl:when test="$InverseMode
                       or
                       self::comment()">
         <!-- drop -->
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:HelperIdentity"/>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:for-each>
 </xsl:template>
 
 <!--
  Source ctxt:    (primitive|template)/operations/op
  Target ctxt:    (primitive|template)/operations/op/meta_attributes
  Target-inv ctxt:(primitive|template)/meta_attributes
  Dependencies:   ProcessNonattrOpMetaAttributes [non-inverse only]
                  ProcessOpInstanceAttributes [non-inverse only]
  -->
 <xsl:template name="cibtr:ProcessAttrOpMetaAttributes">
   <xsl:param name="Source"/>
   <xsl:param name="InverseMode" select="false()"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:ProcessAttrOpMetaAttributes">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InverseMode" select="$InverseMode"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:param>
 
   <xsl:variable name="EnclosingTag" select="../.."/>
 
   <xsl:if test="(
                   $InverseMode
                   and
                   (
                     $InnerSimulation
                     or
                     normalize-space($InnerPass)
                     != string($InnerPass)
                   )
                 )
                 or
                 not($InverseMode)">
     <xsl:if test="$InverseMode
                   and
                   $InnerSimulation">
       <xsl:call-template name="cibtr:HelperDenormalizedSpace">
         <xsl:with-param name="Source" select="$InnerPass"/>
         <xsl:with-param name="ResultTreeFragment" select="true()"/>
       </xsl:call-template>
     </xsl:if>
 
     <!-- cannot combine "copy" with creating a new element, hence we mimic
          "copy" with recreating the element anew, while still using just
          a single for-each loop -->
     <xsl:variable name="ParentName">
       <xsl:choose>
         <xsl:when test="not($InverseMode)">
           <xsl:value-of select="name()"/>
         </xsl:when>
         <xsl:otherwise>
           <xsl:value-of select="'nvpair'"/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:variable>
     <xsl:element name="{$ParentName}">
     <!-- B: special-casing @* -->
     <xsl:for-each select="@*">
       <xsl:variable name="Replacement"
                     select="$cibtr:MapResourcesOperation/cibtr:replace[
                               @what = name(current())
                               and
                               (
                                 (
                                   @in-case-of
                                   and
                                   contains(concat('|', @in-case-of, '|'),
                                            concat('|', current()/../@name, '|'))
                                 )
                                 or
                                 (
                                   not(@in-case-of)
                                   and
                                   not(
                                     $cibtr:MapResourcesOperation/cibtr:replace[
                                       @what = name(current())
                                       and
                                       @in-case-of
                                       and
                                       contains(concat('|', @in-case-of, '|'),
                                                concat('|', current()/../@name, '|'))
                                     ]
                                   )
                                 )
                               )
                             ]"/>
       <xsl:if test="$InnerPass = 'TRIGGER-MSG'">
         <xsl:call-template name="cibtr:MapMsg">
           <xsl:with-param name="Context"
                                 select="concat(../@id,
                                                ' (rsc=', $EnclosingTag/@id,
                                                ')')"/>
           <xsl:with-param name="Replacement" select="$Replacement"/>
         </xsl:call-template>
       </xsl:if>
       <xsl:choose>
         <!-- use inner simulation to find out if success,
              then emit also extra denormalized space -->
         <xsl:when test="$InverseMode
                         and
                         $Replacement/@where = 'meta_attributes'
                         and
                         not(
                           $EnclosingTag/meta_attributes[
                             not(rule)
                             and
                             nvpair/@name = $Replacement/@with
                           ]
                         )">
           <!-- do not override; do not collide with:
                - existing (see last condition above)
                - successors sourced like this (see below) -->
           <xsl:variable name="SimulateFollowingSiblings">
             <xsl:for-each select="../following-sibling::op">
               <xsl:call-template name="cibtr:ProcessAttrOpMetaAttributes">
                 <xsl:with-param name="Source" select="."/>
                 <xsl:with-param name="InverseMode" select="true()"/>
                 <xsl:with-param name="InnerSimulation" select="true()"/>
               </xsl:call-template>
             </xsl:for-each>
           </xsl:variable>
           <xsl:if test="not(contains($SimulateFollowingSiblings,
                                      concat(name(), ' ')))">
             <!-- fix concurrent op/@* sources (these themselves are winning
                  over sources from meta_attributes -->
             <xsl:choose>
               <xsl:when test="$InnerSimulation">
                 <!-- cf. trick C. (indicate for inverse mode) -->
                 <xsl:value-of select="concat(name(), ' ')"/>
               </xsl:when>
               <xsl:otherwise>
                 <xsl:attribute name="id">
                   <xsl:value-of select="concat('_2TO3_', ../@id, '-meta-',
                                                $Replacement/@with)"/>
                 </xsl:attribute>
                 <xsl:attribute name="name">
                   <xsl:value-of select="$Replacement/@with"/>
                 </xsl:attribute>
                 <xsl:attribute name="value">
                   <xsl:value-of select="."/>
                 </xsl:attribute>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:if>
         </xsl:when>
         <xsl:when test="$InverseMode"/>
         <xsl:when test="$Replacement
                         and
                         (
                           not(string($Replacement/@with))
                           or
                           $Replacement/@where
                         )">
           <!-- drop (possibly just move over) -->
         </xsl:when>
         <xsl:when test="$Replacement">
           <xsl:message terminate="yes">
             <xsl:value-of select="concat('INTERNAL ERROR: ',
                                          $Replacement/../@msg-prefix,
                                          ': no in-situ rename',
                                          ' does not hold')"/>
           </xsl:message>
         </xsl:when>
         <xsl:otherwise>
           <xsl:copy/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:for-each>
     <!-- E: special-casing @* -->
 
     <xsl:if test="not($InverseMode)">
       <!-- Look ahead if there are any meta-like instance_attibutes to
            be propagated next door, into existing/new meta_attributes -->
       <xsl:variable name="ProcessedInverseNonruleOpInstanceAttributes">
         <xsl:for-each select="instance_attributes[not(rule)]">
           <xsl:call-template name="cibtr:ProcessOpInstanceAttributes">
             <xsl:with-param name="Source" select="."/>
             <xsl:with-param name="InnerSimulation" select="true()"/>
             <xsl:with-param name="InverseMode" select="true()"/>
             <xsl:with-param name="InnerPass"
                             select="substring-after(
                                       concat(
                                         string($InnerSimulation),
                                         'TRIGGER-MSG'
                                       ),
                                      'true'
                                     )"/>
           </xsl:call-template>
         </xsl:for-each>
       </xsl:variable>
       <!-- B: special-casing instance_attributes|meta_attributes -->
       <xsl:for-each select="$Source/node()">
         <xsl:choose>
           <xsl:when test="self::text()">
             <!-- cf. trick A. (consideration 1.) -->
             <xsl:choose>
               <xsl:when test="normalize-space($InnerPass)
                               != $InnerPass
                               and
                               (
                                 not(following-sibling::nvpair)
                                 or
                                 generate-id(following-sibling::nvpair[1])
                                 != generate-id(following-sibling::*[1])
                               )">
                 <xsl:value-of select="."/>
               </xsl:when>
               <xsl:otherwise>
                 <xsl:value-of select="normalize-space(.)"/>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:when>
           <xsl:when test="self::instance_attributes">
             <xsl:variable name="ProcessedOpInstanceAttributes">
               <xsl:call-template name="cibtr:ProcessOpInstanceAttributes">
                 <xsl:with-param name="Source" select="."/>
                 <xsl:with-param name="InnerSimulation" select="true()"/>
               </xsl:call-template>
             </xsl:variable>
             <!-- cf. trick A. -->
             <xsl:if test="normalize-space($ProcessedOpInstanceAttributes)
                           != $ProcessedOpInstanceAttributes">
               <xsl:copy>
                 <xsl:apply-templates select="@*"
                                      mode="cibtr:main"/>
                 <xsl:call-template name="cibtr:ProcessOpInstanceAttributes">
                   <xsl:with-param name="Source" select="."/>
                   <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
                   <!-- cf. trick E. -->
                   <xsl:with-param name="InnerPass" select="$ProcessedOpInstanceAttributes"/>
                 </xsl:call-template>
               </xsl:copy>
             </xsl:if>
           </xsl:when>
           <xsl:when test="self::meta_attributes">
             <xsl:variable name="ProcessedOpMetaAttributes">
               <xsl:call-template name="cibtr:ProcessNonattrOpMetaAttributes">
                 <xsl:with-param name="Source" select="."/>
                 <xsl:with-param name="InnerSimulation" select="true()"/>
                 <xsl:with-param name="InnerPass"
                                 select="substring-after(
                                           concat(
                                             string($InnerSimulation),
                                             'TRIGGER-MSG'
                                           ),
                                          'true'
                                         )"/>
               </xsl:call-template>
             </xsl:variable>
             <!-- cf. trick A.;
                  possibly piggy-back instance_attributes (if any per
                  above look ahead) to first suitable (not rules-driven)
                  meta_attributes set... -->
             <xsl:if test="normalize-space($ProcessedOpMetaAttributes)
                           != $ProcessedOpMetaAttributes
                           or
                           (
                             not(rule)
                             and
                             not(preceding-sibling::meta_attributes[not(rule)])
                             and
                             normalize-space($ProcessedInverseNonruleOpInstanceAttributes)
                             != $ProcessedInverseNonruleOpInstanceAttributes
                           )">
               <xsl:copy>
                 <xsl:apply-templates select="@*"
                                      mode="cibtr:main"/>
                 <xsl:if test="normalize-space($ProcessedOpMetaAttributes)
                               != $ProcessedOpMetaAttributes">
                   <xsl:call-template name="cibtr:ProcessNonattrOpMetaAttributes">
                     <xsl:with-param name="Source" select="."/>
                     <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
                     <!-- cf. trick E. -->
                     <xsl:with-param name="InnerPass" select="$ProcessedOpMetaAttributes"/>
                   </xsl:call-template>
                 </xsl:if>
                 <xsl:if test="not(rule)
                               and
                               not(preceding-sibling::meta_attributes[not(rule)])
                               and
                               normalize-space($ProcessedInverseNonruleOpInstanceAttributes)
                               != $ProcessedInverseNonruleOpInstanceAttributes">
                   <xsl:for-each select="../instance_attributes[not(rule)]">
                     <xsl:call-template name="cibtr:ProcessOpInstanceAttributes">
                       <xsl:with-param name="Source" select="."/>
                       <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
                       <xsl:with-param name="InverseMode" select="true()"/>
                     </xsl:call-template>
                   </xsl:for-each>
                 </xsl:if>
               </xsl:copy>
             </xsl:if>
           </xsl:when>
           <xsl:otherwise>
             <xsl:call-template name="cibtr:HelperIdentity"/>
           </xsl:otherwise>
         </xsl:choose>
       </xsl:for-each>
       <!-- E: special-casing instance_attributes|meta_attributes -->
 
       <!-- ...or roll out brand new meta_attributes, first collectively
            for no-rules instances... -->
       <xsl:if test="not(meta_attributes[not(rule)])
                     and
                     normalize-space($ProcessedInverseNonruleOpInstanceAttributes)
                     != $ProcessedInverseNonruleOpInstanceAttributes">
         <meta_attributes id="{concat('_2TO3_', @id, '-meta')}">
           <xsl:for-each select="instance_attributes[not(rule)]">
             <xsl:call-template name="cibtr:ProcessOpInstanceAttributes">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
               <xsl:with-param name="InverseMode" select="true()"/>
             </xsl:call-template>
           </xsl:for-each>
           <xsl:apply-templates select="text()[position() = last()]"
                                mode="cibtr:main"/>
         </meta_attributes>
         <xsl:apply-templates select="text()[position() = last()]"
                              mode="cibtr:main"/>
       </xsl:if>
 
       <!-- ...then individually for rules-driven ones -->
       <xsl:for-each select="instance_attributes[rule]">
         <xsl:variable name="ProcessedInverseRuleOpInstanceAttributes">
           <xsl:call-template name="cibtr:ProcessOpInstanceAttributes">
             <xsl:with-param name="Source" select="."/>
             <xsl:with-param name="InnerSimulation" select="true()"/>
             <xsl:with-param name="InverseMode" select="true()"/>
             <xsl:with-param name="InnerPass"
                             select="substring-after(
                                       concat(
                                         string($InnerSimulation),
                                         'TRIGGER-MSG'
                                       ),
                                      'true'
                                     )"/>
           </xsl:call-template>
         </xsl:variable>
         <!-- cf. trick A. -->
         <xsl:if test="normalize-space($ProcessedInverseRuleOpInstanceAttributes)
                       != $ProcessedInverseRuleOpInstanceAttributes">
           <meta_attributes>
             <xsl:apply-templates select="@*[
                                            name() != 'id'
                                          ]"
                                  mode="cibtr:main"/>
             <xsl:attribute name='id'>
               <xsl:value-of select="concat('_2TO3_', @id)"/>
             </xsl:attribute>
             <xsl:apply-templates select="node()[
                                            name() != 'nvpair'
                                          ]"
                                  mode="cibtr:main"/>
             <xsl:call-template name="cibtr:ProcessOpInstanceAttributes">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InverseMode" select="true()"/>
               <!-- cf. trick E. -->
               <xsl:with-param name="InnerPass" select="$ProcessedInverseRuleOpInstanceAttributes"/>
             </xsl:call-template>
             <xsl:apply-templates select="text()[position() = last()]"
                                  mode="cibtr:main"/>
           </meta_attributes>
         </xsl:if>
       </xsl:for-each>
     </xsl:if>
     </xsl:element>
   </xsl:if>
 </xsl:template>
 
 <!--
  Source ctxt:    configuration
  Target ctxt:    {op,rsc}_defaults/meta_attributes [per $Variant, see below]
  Target-inv ctxt:N/A
  Dependencies:   ProcessClusterProperties
 
  Variant:        'op_defaults' | 'rsc_defaults'
  -->
 <xsl:template name="cibtr:ProcessDefaultsNonruleClusterProperties">
   <xsl:param name="Source"/>
   <xsl:param name="Variant"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:ProcessDefaultsNonruleClusterProperties">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="Variant" select="$Variant"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:param>
 
   <xsl:choose>
     <xsl:when test="$Source/*[name() = $Variant]/meta_attributes[
                       not(rule)
                     ]">
       <xsl:call-template name="cibtr:ProcessClusterProperties">
         <xsl:with-param name="Source"
                         select="$Source/crm_config/cluster_property_set[
                                   not(rule)
                                 ]"/>
         <xsl:with-param name="InverseMode"
                         select="$Source/*[name() = $Variant]/meta_attributes[
                                   not(rule)
                                 ]"/>
         <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
       </xsl:call-template>
     </xsl:when>
     <xsl:otherwise>
       <xsl:call-template name="cibtr:ProcessClusterProperties">
         <xsl:with-param name="Source"
                       select="$Source/crm_config/cluster_property_set[
                                   not(rule)
                                 ]"/>
         <xsl:with-param name="InverseMode"
                         select="$Variant"/>
         <xsl:with-param name="InnerSimulation" select="$InnerSimulation"/>
       </xsl:call-template>
     </xsl:otherwise>
   </xsl:choose>
 </xsl:template>
 
 <!--
  Source ctxt:    configuration
  Target ctxt:    {op,rsc}_defaults/meta_attributes [per $Variant, see below]
  Target-inv ctxt:N/A
  Dependencies:   ProcessClusterProperties
 
  Variant:        'op_defaults' | 'rsc_defaults'
  -->
 <xsl:template name="cibtr:ProcessDefaultsRuleClusterProperties">
   <xsl:param name="Source"/>
   <xsl:param name="Variant"/>
   <xsl:param name="InnerSimulation" select="false()"/>
   <xsl:param name="InnerPass">
     <xsl:choose>
       <xsl:when test="$InnerSimulation">
         <xsl:value-of select="''"/>
       </xsl:when>
       <xsl:otherwise>
         <xsl:call-template name="cibtr:ProcessDefaultsRuleClusterProperties">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="Variant" select="$Variant"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:otherwise>
     </xsl:choose>
   </xsl:param>
 
   <xsl:for-each select="crm_config/cluster_property_set[
                           rule
                         ]">
     <xsl:variable name="ProcessedPartial">
       <xsl:call-template name="cibtr:ProcessClusterProperties">
         <xsl:with-param name="Source" select="$Source"/>
         <xsl:with-param name="InverseMode" select="$Variant"/>
         <xsl:with-param name="InnerSimulation" select="true()"/>
         <xsl:with-param name="InnerPass" select="'TRIGGER-MSG'"/>
       </xsl:call-template>
     </xsl:variable>
     <xsl:if test="normalize-space($ProcessedPartial)
                   != $ProcessedPartial">
       <meta_attributes id="{concat('_2TO3_', @id)}">
         <xsl-copy-of select="rule"/>
         <xsl:call-template name="cibtr:ProcessClusterProperties">
           <xsl:with-param name="Source" select="$Source"/>
           <xsl:with-param name="InverseMode" select="$Variant"/>
         </xsl:call-template>
       </meta_attributes>
     </xsl:if>
   </xsl:for-each>
 </xsl:template>
 
 <!--
 
  ACTUAL TRANSFORMATION
 
  -->
 
 <xsl:template match="cib" mode="cibtr:main">
   <xsl:copy>
     <xsl:apply-templates select="@*"
                          mode="cibtr:main"/>
     <xsl:attribute name="validate-with">
       <xsl:value-of select="concat('pacemaker-', $cibtr:cib-min-ver)"/>
     </xsl:attribute>
     <xsl:apply-templates select="node()"
                          mode="cibtr:main"/>
   </xsl:copy>
 </xsl:template>
 
 <xsl:template match="cluster_property_set" mode="cibtr:main">
   <xsl:variable name="ProcessedClusterProperties">
     <xsl:call-template name="cibtr:ProcessClusterProperties">
       <xsl:with-param name="Source" select="."/>
       <xsl:with-param name="InnerSimulation" select="true()"/>
       <xsl:with-param name="InnerPass" select="'TRIGGER-MSG'"/>
     </xsl:call-template>
   </xsl:variable>
   <xsl:if test="normalize-space($ProcessedClusterProperties)
                 != $ProcessedClusterProperties">
     <xsl:copy>
       <xsl:apply-templates select="@*"
                            mode="cibtr:main"/>
       <xsl:call-template name="cibtr:ProcessClusterProperties">
         <xsl:with-param name="Source" select="."/>
         <!-- cf. trick E. -->
         <xsl:with-param name="InnerPass" select="$ProcessedClusterProperties"/>
       </xsl:call-template>
     </xsl:copy>
   </xsl:if>
 </xsl:template>
 
 <xsl:template match="rsc_colocation" mode="cibtr:main">
   <xsl:copy>
     <xsl:for-each select="@*">
       <xsl:variable name="Replacement"
                     select="$cibtr:MapConstraintsColocation/cibtr:replace[
                               @what = name(current())
                             ]"/>
       <xsl:call-template name="cibtr:MapMsg">
         <xsl:with-param name="Context" select="../@id"/>
         <xsl:with-param name="Replacement" select="$Replacement"/>
       </xsl:call-template>
       <xsl:choose>
         <xsl:when test="$Replacement
                         and
                         not(string($Replacement/@with))">
           <!-- drop -->
         </xsl:when>
         <xsl:when test="$Replacement">
           <!-- rename -->
           <xsl:attribute name="{name()}">
             <xsl:value-of select="$Replacement/@with"/>
           </xsl:attribute>
         </xsl:when>
         <xsl:otherwise>
           <xsl:copy/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:for-each>
     <xsl:apply-templates select="node()"
                          mode="cibtr:main"/>
   </xsl:copy>
 </xsl:template>
 
 <xsl:template match="node" mode="cibtr:main">
   <xsl:copy>
     <xsl:for-each select="@*">
       <xsl:variable name="Replacement"
                     select="$cibtr:MapClusterNode/cibtr:replace[
                               @what = name(current())
                               and
                               (
                                 (
                                   @in-case-of
                                   and
                                   contains(concat('|', @in-case-of, '|'),
                                            concat('|', current(), '|'))
                                 )
                                 or
                                 (
                                   not(@in-case-of)
                                   and
                                   not(
                                     $cibtr:MapClusterNode/cibtr:replace[
                                       @what = name(current())
                                       and
                                       @in-case-of
                                       and
                                       contains(concat('|', @in-case-of, '|'),
                                                concat('|', current(), '|'))
                                     ]
                                   )
                                 )
                               )
                             ]"/>
       <xsl:call-template name="cibtr:MapMsg">
         <xsl:with-param name="Context" select="concat(../@uname, ' (id=', ../@id, ')')"/>
         <xsl:with-param name="Replacement" select="$Replacement"/>
       </xsl:call-template>
       <xsl:choose>
         <xsl:when test="$Replacement
                         and
                         not(string($Replacement/@with))">
           <!-- drop -->
         </xsl:when>
         <xsl:when test="$Replacement">
           <!-- rename -->
           <xsl:attribute name="{$Replacement/@with}">
             <xsl:choose>
               <xsl:when test="$Replacement/@redefined-as">
                 <xsl:value-of select="$Replacement/@redefined-as"/>
               </xsl:when>
               <xsl:otherwise>
                 <xsl:value-of select="."/>
               </xsl:otherwise>
             </xsl:choose>
           </xsl:attribute>
         </xsl:when>
         <xsl:otherwise>
           <xsl:copy/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:for-each>
     <xsl:apply-templates select="node()"
                          mode="cibtr:main"/>
   </xsl:copy>
 </xsl:template>
 
 <!--
  1a. propagate (primitive|template)/operations/
        op[name() = 'start' or name() = 'promote']/@requires
      under new ./meta_attributes/nvpair
 
  1b. "move" (primitive|template)/operations/
        op[name() = 'start' or name() = 'promote']/
        meta_attributes/nvpair[@requires]
      under ./meta_attributes
 
   otherwise, just
 
  2a.  drop (primitive|template)/operations/
         op/@requires
 
  2b.  drop (primitive|template)/operations/
         op/meta_attributes/nvpair[@requires]
  -->
 <xsl:template match="primitive|template" mode="cibtr:main">
   <xsl:copy>
     <xsl:apply-templates select="@*"
                          mode="cibtr:main"/>
     <!-- B: special-casing operations|instance_attributes|meta_attributes -->
     <xsl:for-each select="node()">
       <xsl:choose>
         <xsl:when test="self::operations">
           <xsl:copy>
             <xsl:apply-templates select="@*"
                                  mode="cibtr:main"/>
             <!-- B: special-casing op -->
             <xsl:for-each select="node()">
               <xsl:choose>
                 <xsl:when test="self::op">
                   <!-- process @*|meta_attributes/nvpair
                        (keep/drop/move elsewhere) -->
                   <xsl:call-template name="cibtr:ProcessAttrOpMetaAttributes">
                     <xsl:with-param name="Source" select="."/>
                   </xsl:call-template>
                 </xsl:when>
                 <xsl:otherwise>
                   <xsl:call-template name="cibtr:HelperIdentity"/>
                 </xsl:otherwise>
               </xsl:choose>
             </xsl:for-each>
             <!-- E: special-casing op -->
           </xsl:copy>
         </xsl:when>
         <xsl:when test="self::instance_attributes">
           <xsl:variable name="ProcessedRscInstanceAttributes">
             <xsl:call-template name="cibtr:ProcessRscInstanceAttributes">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="true()"/>
               <xsl:with-param name="InnerPass" select="'TRIGGER-MSG'"/>
             </xsl:call-template>
           </xsl:variable>
           <!-- cf. trick A. -->
           <xsl:if test="normalize-space($ProcessedRscInstanceAttributes)
                         != $ProcessedRscInstanceAttributes">
             <xsl:copy>
               <xsl:apply-templates select="@*"
                                    mode="cibtr:main"/>
               <xsl:call-template name="cibtr:ProcessRscInstanceAttributes">
                 <xsl:with-param name="Source" select="."/>
                 <!-- cf. trick E. -->
                 <xsl:with-param name="InnerPass" select="$ProcessedRscInstanceAttributes"/>
               </xsl:call-template>
             </xsl:copy>
           </xsl:if>
         </xsl:when>
         <xsl:when test="self::meta_attributes">
           <xsl:variable name="ProcessedRscMetaAttributes">
             <xsl:call-template name="cibtr:ProcessRscMetaAttributes">
               <xsl:with-param name="Source" select="."/>
               <xsl:with-param name="InnerSimulation" select="true()"/>
               <xsl:with-param name="InnerPass" select="'TRIGGER-MSG'"/>
             </xsl:call-template>
           </xsl:variable>
           <!-- cf. trick A. -->
           <xsl:if test="normalize-space($ProcessedRscMetaAttributes)
                         != $ProcessedRscMetaAttributes">
             <xsl:copy>
               <xsl:apply-templates select="@*"
                                    mode="cibtr:main"/>
               <xsl:call-template name="cibtr:ProcessRscMetaAttributes">
                 <xsl:with-param name="Source" select="."/>
                 <!-- cf. trick E. -->
                 <xsl:with-param name="InnerPass" select="$ProcessedRscMetaAttributes"/>
               </xsl:call-template>
             </xsl:copy>
           </xsl:if>
         </xsl:when>
         <xsl:otherwise>
           <xsl:call-template name="cibtr:HelperIdentity"/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:for-each>
     <!-- E: special-casing operations|instance_attributes|meta_attributes -->
 
     <!-- add as last meta_attributes block... -->
 
     <!-- ...indirectly from op attributes -->
     <xsl:variable name="ToPropagateFromOp">
       <xsl:for-each select="operations/op">
         <xsl:call-template name="cibtr:ProcessAttrOpMetaAttributes">
           <xsl:with-param name="Source" select="."/>
           <xsl:with-param name="InverseMode" select="true()"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
           <xsl:with-param name="InnerPass" select="'TRIGGER-MSG'"/>
         </xsl:call-template>
       </xsl:for-each>
     </xsl:variable>
     <!-- cf. trick A. -->
     <xsl:if test="normalize-space($ToPropagateFromOp)
                   != $ToPropagateFromOp">
       <meta_attributes id="{concat('_2TO3_', @id, '-meta')}">
         <xsl:for-each select="operations/op">
           <xsl:call-template name="cibtr:ProcessAttrOpMetaAttributes">
             <xsl:with-param name="Source" select="."/>
             <xsl:with-param name="InverseMode" select="true()"/>
           </xsl:call-template>
         </xsl:for-each>
         <xsl:apply-templates select="text()[position() = last()]"
                              mode="cibtr:main"/>
       </meta_attributes>
       <xsl:apply-templates select="text()[position() = last()]"
                            mode="cibtr:main"/>
     </xsl:if>
 
     <!-- ...directly by picking existing nvpairs of
          meta_attributes|instance_attributes -->
     <xsl:for-each select="operations/op/meta_attributes
                           |operations/op/instance_attributes">
       <xsl:variable name="ProcessedOpMetaAttributes">
         <xsl:call-template name="cibtr:ProcessNonattrOpMetaAttributes">
           <xsl:with-param name="Source" select="."/>
           <xsl:with-param name="InverseMode" select="true()"/>
           <xsl:with-param name="InnerSimulation" select="true()"/>
         </xsl:call-template>
       </xsl:variable>
       <!-- cf. trick A. -->
       <xsl:if test="normalize-space($ProcessedOpMetaAttributes)
                     != $ProcessedOpMetaAttributes">
         <!-- cannot xsl:copy, need to settle on meta_attributes -->
         <meta_attributes>
           <xsl:apply-templates select="@*[
                                          name() != 'id'
                                        ]"
                                mode="cibtr:main"/>
           <xsl:attribute name='id'>
             <xsl:value-of select="concat('_2TO3_', @id)"/>
           </xsl:attribute>
           <xsl:apply-templates select="node()[
                                          name() != 'nvpair'
                                        ]"
                                mode="cibtr:main"/>
           <xsl:call-template name="cibtr:ProcessNonattrOpMetaAttributes">
             <xsl:with-param name="Source" select="."/>
             <xsl:with-param name="InverseMode" select="true()"/>
             <!-- cf. trick E. -->
             <xsl:with-param name="InnerPass" select="$ProcessedOpMetaAttributes"/>
           </xsl:call-template>
           <xsl:apply-templates select="text()[position() = last()]"
                                mode="cibtr:main"/>
         </meta_attributes>
         <xsl:apply-templates select="text()[position() = last()]"
                              mode="cibtr:main"/>
       </xsl:if>
     </xsl:for-each>
   </xsl:copy>
 </xsl:template>
 
 <xsl:template match="configuration" mode="cibtr:main">
   <xsl:variable name="Configuration" select="."/>
   <xsl:variable name="ProcessedOpDefaultsNonruleClusterProperties">
     <xsl:call-template name="cibtr:ProcessDefaultsNonruleClusterProperties">
       <xsl:with-param name="Source" select="$Configuration"/>
       <xsl:with-param name="Variant" select="'op_defaults'"/>
       <xsl:with-param name="InnerSimulation" select="true()"/>
     </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="ProcessedRscDefaultsNonruleClusterProperties">
     <xsl:call-template name="cibtr:ProcessDefaultsNonruleClusterProperties">
       <xsl:with-param name="Source" select="$Configuration"/>
       <xsl:with-param name="Variant" select="'rsc_defaults'"/>
       <xsl:with-param name="InnerSimulation" select="true()"/>
     </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="ProcessedOpDefaultsRuleClusterProperties">
     <xsl:call-template name="cibtr:ProcessDefaultsNonruleClusterProperties">
       <xsl:with-param name="Source" select="$Configuration"/>
       <xsl:with-param name="Variant" select="'op_defaults'"/>
       <xsl:with-param name="InnerSimulation" select="true()"/>
     </xsl:call-template>
   </xsl:variable>
   <xsl:variable name="ProcessedRscDefaultsRuleClusterProperties">
     <xsl:call-template name="cibtr:ProcessDefaultsNonruleClusterProperties">
       <xsl:with-param name="Source" select="$Configuration"/>
       <xsl:with-param name="Variant" select="'rsc_defaults'"/>
       <xsl:with-param name="InnerSimulation" select="true()"/>
     </xsl:call-template>
   </xsl:variable>
 
   <xsl:copy>
     <xsl:apply-templates select="@*"
                          mode="cibtr:main"/>
     <!-- B: special-casing {op,rsc}_defaults -->
     <xsl:for-each select="node()">
       <xsl:choose>
         <xsl:when test="self::op_defaults|self::rsc_defaults">
           <xsl:variable name="WhichDefaults" select="name()"/>
           <xsl:copy>
             <xsl:apply-templates select="@*"
                                  mode="cibtr:main"/>
             <!-- B: special-casing meta_attributes -->
             <xsl:for-each select="node()">
               <xsl:copy>
                 <xsl:choose>
                   <xsl:when test="self::meta_attributes[
                                     not(rule)
                                     and
                                     not(
                                       preceding-sibling::meta_attributes[
                                         not(rule)
                                       ]
                                     )
                                   ]">
                   <xsl:apply-templates select="@*|node()"
                                        mode="cibtr:main"/>
                     <xsl:if test="$WhichDefaults = 'op_defaults'
                                   or
                                   $WhichDefaults = 'rsc_defaults'">
                       <xsl:call-template name="cibtr:ProcessDefaultsNonruleClusterProperties">
                         <xsl:with-param name="Source" select="$Configuration"/>
                         <xsl:with-param name="Variant" select="$WhichDefaults"/>
                       </xsl:call-template>
                     </xsl:if>
                   </xsl:when>
                   <xsl:otherwise>
                     <xsl:apply-templates select="@*|node()"
                                          mode="cibtr:main"/>
                   </xsl:otherwise>
                 </xsl:choose>
                 <xsl:if test="(
                                 $WhichDefaults = 'op_defaults'
                                 and
                                 normalize-space($ProcessedOpDefaultsRuleClusterProperties)
                                 != $ProcessedOpDefaultsRuleClusterProperties
                               )
                               or
                               (
                                 $WhichDefaults = 'rsc_defaults'
                                 and
                                 normalize-space($ProcessedRscDefaultsRuleClusterProperties)
                                 != $ProcessedRscDefaultsRuleClusterProperties
                               )">
                   <xsl:call-template name="cibtr:ProcessDefaultsRuleClusterProperties">
                     <xsl:with-param name="Source" select="$Configuration"/>
                     <xsl:with-param name="Variant" select="$WhichDefaults"/>
                   </xsl:call-template>
                 </xsl:if>
               </xsl:copy>
             </xsl:for-each>
             <!-- E: special-casing meta_attributes -->
           </xsl:copy>
         </xsl:when>
         <xsl:otherwise>
           <xsl:call-template name="cibtr:HelperIdentity"/>
         </xsl:otherwise>
       </xsl:choose>
     </xsl:for-each>
     <!-- E: special-casing {op,rsc}_defaults -->
     <xsl:if test="not(op_defaults)
                   and
                   (
                     normalize-space($ProcessedOpDefaultsNonruleClusterProperties)
                     != $ProcessedOpDefaultsNonruleClusterProperties
                     or
                     normalize-space($ProcessedOpDefaultsRuleClusterProperties)
                     != $ProcessedOpDefaultsRuleClusterProperties
                   )">
       <op_defaults>
         <xsl:if test="normalize-space($ProcessedOpDefaultsNonruleClusterProperties)
                       != $ProcessedOpDefaultsNonruleClusterProperties">
           <meta_attributes id="{concat('_2TO3_', '-op-defaults')}">
             <xsl:call-template name="cibtr:ProcessDefaultsNonruleClusterProperties">
               <xsl:with-param name="Source" select="$Configuration"/>
               <xsl:with-param name="Variant" select="'op_defaults'"/>
             </xsl:call-template>
           </meta_attributes>
         </xsl:if>
         <xsl:call-template name="cibtr:ProcessDefaultsRuleClusterProperties">
           <xsl:with-param name="Source" select="$Configuration"/>
           <xsl:with-param name="Variant" select="'op_defaults'"/>
         </xsl:call-template>
         <xsl:apply-templates select="text()[position() = last()]"
                              mode="cibtr:main"/>
       </op_defaults>
     </xsl:if>
     <xsl:if test="not(rsc_defaults)
                   and
                   (
                     normalize-space($ProcessedRscDefaultsNonruleClusterProperties)
                     != $ProcessedRscDefaultsNonruleClusterProperties
                     or
                     normalize-space($ProcessedRscDefaultsRuleClusterProperties)
                     != $ProcessedRscDefaultsRuleClusterProperties
                   )">
       <rsc_defaults>
         <xsl:if test="normalize-space($ProcessedRscDefaultsNonruleClusterProperties)
                       != $ProcessedRscDefaultsNonruleClusterProperties">
           <meta_attributes id="{concat('_2TO3_', '-rsc-defaults')}">
             <xsl:call-template name="cibtr:ProcessDefaultsNonruleClusterProperties">
               <xsl:with-param name="Source" select="$Configuration"/>
               <xsl:with-param name="Variant" select="'rsc_defaults'"/>
             </xsl:call-template>
           </meta_attributes>
         </xsl:if>
         <xsl:call-template name="cibtr:ProcessDefaultsRuleClusterProperties">
           <xsl:with-param name="Source" select="$Configuration"/>
           <xsl:with-param name="Variant" select="'rsc_defaults'"/>
         </xsl:call-template>
         <xsl:apply-templates select="text()[position() = last()]"
                              mode="cibtr:main"/>
       </rsc_defaults>
     </xsl:if>
   </xsl:copy>
 </xsl:template>
 
 <!-- used in test files to allow in-browser on-the-fly upgrade reports -->
 <xsl:template match="processing-instruction()[
                        name() = 'xml-stylesheet'
                        and
                        count(..|/) = 1
                      ]"
               mode="cibtr:main"/>
 
 <xsl:template match="@*|node()" mode="cibtr:main">
   <xsl:call-template name="cibtr:HelperIdentity"/>
 </xsl:template>
 
 <!-- mode-less, easy to override kick-off -->
 <xsl:template match="/">
   <xsl:call-template name="cibtr:HelperIdentity"/>
 </xsl:template>
 
 </xsl:stylesheet>