diff --git a/pengine/test10/order-serialize-set.dot b/pengine/test10/order-serialize-set.dot
index 175dc8e3d0..d21c4d1db8 100644
--- a/pengine/test10/order-serialize-set.dot
+++ b/pengine/test10/order-serialize-set.dot
@@ -1,82 +1,65 @@
 digraph "g" {
 "all_stopped" -> "xen-b-fencing_stop_0 xen-a" [ style = bold]
 "all_stopped" [ style=bold color="green" fontcolor="orange"  ]
 "base_migrate_from_0 xen-b" -> "all_stopped" [ style = bold]
 "base_migrate_from_0 xen-b" -> "base_monitor_10000 xen-b" [ style = bold]
-"base_migrate_from_0 xen-b" -> "xen-set-start-end" [ style = bold]
 "base_migrate_from_0 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "base_migrate_to_0 xen-a" -> "all_stopped" [ style = bold]
 "base_migrate_to_0 xen-a" -> "base_migrate_from_0 xen-b" [ style = bold]
 "base_migrate_to_0 xen-a" [ style=bold color="green" fontcolor="black"  ]
 "base_monitor_10000 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "core-101_migrate_from_0 xen-b" -> "all_stopped" [ style = bold]
 "core-101_migrate_from_0 xen-b" -> "base_migrate_from_0 xen-b" [ style = bold]
 "core-101_migrate_from_0 xen-b" -> "base_migrate_to_0 xen-a" [ style = bold]
 "core-101_migrate_from_0 xen-b" -> "core-101_monitor_10000 xen-b" [ style = bold]
 "core-101_migrate_from_0 xen-b" -> "core-200_migrate_from_0 xen-b" [ style = bold]
 "core-101_migrate_from_0 xen-b" -> "core-200_migrate_to_0 xen-a" [ style = bold]
 "core-101_migrate_from_0 xen-b" -> "edge_migrate_from_0 xen-b" [ style = bold]
 "core-101_migrate_from_0 xen-b" -> "edge_migrate_to_0 xen-a" [ style = bold]
-"core-101_migrate_from_0 xen-b" -> "xen-set-start-end" [ style = bold]
 "core-101_migrate_from_0 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "core-101_migrate_to_0 xen-a" -> "all_stopped" [ style = bold]
 "core-101_migrate_to_0 xen-a" -> "core-101_migrate_from_0 xen-b" [ style = bold]
 "core-101_migrate_to_0 xen-a" [ style=bold color="green" fontcolor="black"  ]
 "core-101_monitor_10000 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "core-200_migrate_from_0 xen-b" -> "all_stopped" [ style = bold]
 "core-200_migrate_from_0 xen-b" -> "base_migrate_from_0 xen-b" [ style = bold]
 "core-200_migrate_from_0 xen-b" -> "base_migrate_to_0 xen-a" [ style = bold]
 "core-200_migrate_from_0 xen-b" -> "core-200_monitor_10000 xen-b" [ style = bold]
 "core-200_migrate_from_0 xen-b" -> "edge_migrate_from_0 xen-b" [ style = bold]
 "core-200_migrate_from_0 xen-b" -> "edge_migrate_to_0 xen-a" [ style = bold]
-"core-200_migrate_from_0 xen-b" -> "xen-set-start-end" [ style = bold]
 "core-200_migrate_from_0 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "core-200_migrate_to_0 xen-a" -> "all_stopped" [ style = bold]
 "core-200_migrate_to_0 xen-a" -> "core-200_migrate_from_0 xen-b" [ style = bold]
 "core-200_migrate_to_0 xen-a" [ style=bold color="green" fontcolor="black"  ]
 "core-200_monitor_10000 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "db_migrate_from_0 xen-b" -> "all_stopped" [ style = bold]
 "db_migrate_from_0 xen-b" -> "base_migrate_from_0 xen-b" [ style = bold]
 "db_migrate_from_0 xen-b" -> "base_migrate_to_0 xen-a" [ style = bold]
 "db_migrate_from_0 xen-b" -> "core-101_migrate_from_0 xen-b" [ style = bold]
 "db_migrate_from_0 xen-b" -> "core-101_migrate_to_0 xen-a" [ style = bold]
 "db_migrate_from_0 xen-b" -> "core-200_migrate_from_0 xen-b" [ style = bold]
 "db_migrate_from_0 xen-b" -> "core-200_migrate_to_0 xen-a" [ style = bold]
 "db_migrate_from_0 xen-b" -> "db_monitor_10000 xen-b" [ style = bold]
 "db_migrate_from_0 xen-b" -> "edge_migrate_from_0 xen-b" [ style = bold]
 "db_migrate_from_0 xen-b" -> "edge_migrate_to_0 xen-a" [ style = bold]
-"db_migrate_from_0 xen-b" -> "xen-set-start-end" [ style = bold]
 "db_migrate_from_0 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "db_migrate_to_0 xen-a" -> "all_stopped" [ style = bold]
 "db_migrate_to_0 xen-a" -> "db_migrate_from_0 xen-b" [ style = bold]
 "db_migrate_to_0 xen-a" [ style=bold color="green" fontcolor="black"  ]
 "db_monitor_10000 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "edge_migrate_from_0 xen-b" -> "all_stopped" [ style = bold]
 "edge_migrate_from_0 xen-b" -> "base_migrate_from_0 xen-b" [ style = bold]
 "edge_migrate_from_0 xen-b" -> "base_migrate_to_0 xen-a" [ style = bold]
 "edge_migrate_from_0 xen-b" -> "edge_monitor_10000 xen-b" [ style = bold]
-"edge_migrate_from_0 xen-b" -> "xen-set-start-end" [ style = bold]
 "edge_migrate_from_0 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "edge_migrate_to_0 xen-a" -> "all_stopped" [ style = bold]
 "edge_migrate_to_0 xen-a" -> "edge_migrate_from_0 xen-b" [ style = bold]
 "edge_migrate_to_0 xen-a" [ style=bold color="green" fontcolor="black"  ]
 "edge_monitor_10000 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "xen-a-fencing_monitor_60000 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "xen-a-fencing_start_0 xen-b" -> "xen-a-fencing_monitor_60000 xen-b" [ style = bold]
 "xen-a-fencing_start_0 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "xen-a-fencing_stop_0 xen-b" -> "xen-a-fencing_start_0 xen-b" [ style = bold]
 "xen-a-fencing_stop_0 xen-b" [ style=bold color="green" fontcolor="black"  ]
 "xen-b-fencing_stop_0 xen-a" [ style=bold color="green" fontcolor="black"  ]
-"xen-set-start-begin" -> "base_migrate_from_0 xen-b" [ style = bold]
-"xen-set-start-begin" -> "base_migrate_to_0 xen-a" [ style = bold]
-"xen-set-start-begin" -> "core-101_migrate_from_0 xen-b" [ style = bold]
-"xen-set-start-begin" -> "core-101_migrate_to_0 xen-a" [ style = bold]
-"xen-set-start-begin" -> "core-200_migrate_from_0 xen-b" [ style = bold]
-"xen-set-start-begin" -> "core-200_migrate_to_0 xen-a" [ style = bold]
-"xen-set-start-begin" -> "db_migrate_from_0 xen-b" [ style = bold]
-"xen-set-start-begin" -> "db_migrate_to_0 xen-a" [ style = bold]
-"xen-set-start-begin" -> "edge_migrate_from_0 xen-b" [ style = bold]
-"xen-set-start-begin" -> "edge_migrate_to_0 xen-a" [ style = bold]
-"xen-set-start-begin" [ style=bold color="green" fontcolor="orange"  ]
-"xen-set-start-end" [ style=bold color="green" fontcolor="orange"  ]
 }
diff --git a/pengine/test10/order-serialize-set.exp b/pengine/test10/order-serialize-set.exp
index 07dadcb3f6..15d724eda9 100644
--- a/pengine/test10/order-serialize-set.exp
+++ b/pengine/test10/order-serialize-set.exp
@@ -1,392 +1,329 @@
 <transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
       <rsc_op id="7" operation="monitor" operation_key="xen-a-fencing_monitor_60000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="xen-a-fencing" long-id="xen-a-fencing" class="stonith" type="external/ipmi"/>
         <attributes CRM_meta_interval="60000" CRM_meta_name="monitor" CRM_meta_start_delay="15000" CRM_meta_timeout="75000" crm_feature_set="3.0.2" hostname="xen-a" interface="lanplus" ipaddr="217.148.178.55" passwd="****" userid="root"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="start" operation_key="xen-a-fencing_start_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="12" operation="start" operation_key="xen-a-fencing_start_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="14" operation="start" operation_key="xen-a-fencing_start_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="12" operation="start" operation_key="xen-a-fencing_start_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="xen-a-fencing" long-id="xen-a-fencing" class="stonith" type="external/ipmi"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2" hostname="xen-a" interface="lanplus" ipaddr="217.148.178.55" passwd="****" userid="root"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="18" operation="stop" operation_key="xen-a-fencing_stop_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="16" operation="stop" operation_key="xen-a-fencing_stop_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="18" operation="stop" operation_key="xen-a-fencing_stop_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="16" operation="stop" operation_key="xen-a-fencing_stop_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="xen-a-fencing" long-id="xen-a-fencing" class="stonith" type="external/ipmi"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs/>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="19" operation="stop" operation_key="xen-b-fencing_stop_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
+      <rsc_op id="17" operation="stop" operation_key="xen-b-fencing_stop_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
         <primitive id="xen-b-fencing" long-id="xen-b-fencing" class="stonith" type="external/ipmi"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="13" operation="all_stopped" operation_key="all_stopped"/>
+        <pseudo_event id="11" operation="all_stopped" operation_key="all_stopped"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="20" operation="migrate_to" operation_key="db_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
+      <rsc_op id="18" operation="migrate_to" operation_key="db_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
         <primitive id="db" long-id="db" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_to" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="db" xmfile="/etc/xen/db.cfg"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="db" long-id="db" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_source_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_from" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="db" xmfile="/etc/xen/db.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="20" operation="migrate_to" operation_key="db_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="18" operation="migrate_to" operation_key="db_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="22" operation="monitor" operation_key="db_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="20" operation="monitor" operation_key="db_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="db" long-id="db" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.2" name="db" xmfile="/etc/xen/db.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="25" operation="migrate_to" operation_key="core-101_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
+      <rsc_op id="23" operation="migrate_to" operation_key="core-101_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
         <primitive id="core-101" long-id="core-101" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_to" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="core-101" xmfile="/etc/xen/core-101.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="24" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="core-101" long-id="core-101" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_source_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_from" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="core-101" xmfile="/etc/xen/core-101.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="25" operation="migrate_to" operation_key="core-101_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="23" operation="migrate_to" operation_key="core-101_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="27" operation="monitor" operation_key="core-101_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="25" operation="monitor" operation_key="core-101_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="core-101" long-id="core-101" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="30000" crm_feature_set="3.0.2" name="core-101" xmfile="/etc/xen/core-101.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="24" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="28" operation="migrate_to" operation_key="core-200_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
+      <rsc_op id="26" operation="migrate_to" operation_key="core-200_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
         <primitive id="core-200" long-id="core-200" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_to" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="core-200" xmfile="/etc/xen/core-200.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="24" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="29" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="27" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="core-200" long-id="core-200" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_source_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_from" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="core-200" xmfile="/etc/xen/core-200.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="24" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="28" operation="migrate_to" operation_key="core-200_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="26" operation="migrate_to" operation_key="core-200_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <rsc_op id="30" operation="monitor" operation_key="core-200_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="28" operation="monitor" operation_key="core-200_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="core-200" long-id="core-200" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.2" name="core-200" xmfile="/etc/xen/core-200.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="29" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="27" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="13">
     <action_set>
-      <rsc_op id="33" operation="migrate_to" operation_key="edge_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
+      <rsc_op id="31" operation="migrate_to" operation_key="edge_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
         <primitive id="edge" long-id="edge" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_to" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="edge" xmfile="/etc/xen/edge.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="24" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="29" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="27" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="14">
     <action_set>
-      <rsc_op id="34" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="32" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="edge" long-id="edge" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_source_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_from" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="edge" xmfile="/etc/xen/edge.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="24" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="27" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="29" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="33" operation="migrate_to" operation_key="edge_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="31" operation="migrate_to" operation_key="edge_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="15">
     <action_set>
-      <rsc_op id="35" operation="monitor" operation_key="edge_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="33" operation="monitor" operation_key="edge_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="edge" long-id="edge" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.2" name="edge" xmfile="/etc/xen/edge.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="34" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="32" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="16">
     <action_set>
-      <rsc_op id="36" operation="migrate_to" operation_key="base_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
+      <rsc_op id="34" operation="migrate_to" operation_key="base_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7">
         <primitive id="base" long-id="base" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_to" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="base" xmfile="/etc/xen/base.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="24" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="29" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="27" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="32" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="17">
     <action_set>
-      <rsc_op id="37" operation="migrate_from" operation_key="base_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="35" operation="migrate_from" operation_key="base_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="base" long-id="base" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_migrate_source="xen-a" CRM_meta_migrate_source_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7" CRM_meta_migrate_target="xen-b" CRM_meta_name="migrate_from" CRM_meta_timeout="400000" crm_feature_set="3.0.2" name="base" xmfile="/etc/xen/base.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="24" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="29" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="27" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="32" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="36" operation="migrate_to" operation_key="base_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="34" operation="migrate_to" operation_key="base_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="18">
     <action_set>
-      <rsc_op id="38" operation="monitor" operation_key="base_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
+      <rsc_op id="36" operation="monitor" operation_key="base_monitor_10000" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331">
         <primitive id="base" long-id="base" class="ocf" provider="heartbeat" type="Xen"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_timeout="20000" crm_feature_set="3.0.2" name="base" xmfile="/etc/xen/base.cfg"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="37" operation="migrate_from" operation_key="base_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="35" operation="migrate_from" operation_key="base_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="19">
     <action_set>
-      <pseudo_event id="11" operation="xen-set-start-end" operation_key="xen-set-start-end">
-        <attributes crm_feature_set="3.0.2"/>
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="29" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="34" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="37" operation="migrate_from" operation_key="base_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="20">
-    <action_set>
-      <pseudo_event id="12" operation="xen-set-start-begin" operation_key="xen-set-start-begin">
-        <attributes crm_feature_set="3.0.2"/>
-      </pseudo_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="21">
-    <action_set>
-      <pseudo_event id="13" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="11" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.2"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="20" operation="migrate_to" operation_key="db_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="18" operation="migrate_to" operation_key="db_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
       <trigger>
-        <rsc_op id="21" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="19" operation="migrate_from" operation_key="db_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="25" operation="migrate_to" operation_key="core-101_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="23" operation="migrate_to" operation_key="core-101_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
       <trigger>
-        <rsc_op id="26" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="24" operation="migrate_from" operation_key="core-101_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="28" operation="migrate_to" operation_key="core-200_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="26" operation="migrate_to" operation_key="core-200_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
       <trigger>
-        <rsc_op id="29" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="27" operation="migrate_from" operation_key="core-200_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="33" operation="migrate_to" operation_key="edge_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="31" operation="migrate_to" operation_key="edge_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
       <trigger>
-        <rsc_op id="34" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="32" operation="migrate_from" operation_key="edge_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
       <trigger>
-        <rsc_op id="36" operation="migrate_to" operation_key="base_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
+        <rsc_op id="34" operation="migrate_to" operation_key="base_migrate_to_0" on_node="xen-a" on_node_uuid="445a93d5-655e-430b-b45d-47d79a2f78c7"/>
       </trigger>
       <trigger>
-        <rsc_op id="37" operation="migrate_from" operation_key="base_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
+        <rsc_op id="35" operation="migrate_from" operation_key="base_migrate_from_0" on_node="xen-b" on_node_uuid="9cb7f556-e0a7-4073-8845-2d7c1d54e331"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>
 
diff --git a/pengine/test10/order-sets.dot b/pengine/test10/order-sets.dot
index a2061600dc..ae42a75fbb 100644
--- a/pengine/test10/order-sets.dot
+++ b/pengine/test10/order-sets.dot
@@ -1,53 +1,33 @@
 digraph "g" {
 "all_stopped" [ style=bold color="green" fontcolor="orange"  ]
-"order-1-set-1-start-begin" -> "world1_start_0 ubuntu_1" [ style = bold]
-"order-1-set-1-start-begin" -> "world2_start_0 ubuntu_1" [ style = bold]
-"order-1-set-1-start-begin" -> "world3_start_0 ubuntu_1" [ style = bold]
-"order-1-set-1-start-begin" -> "world4_start_0 ubuntu_1" [ style = bold]
-"order-1-set-1-start-begin" [ style=bold color="green" fontcolor="orange"  ]
-"order-1-set-1-start-end" [ style=bold color="green" fontcolor="orange"  ]
-"order-1-set-1-stop-begin" -> "world1_stop_0 ubuntu_2" [ style = bold]
-"order-1-set-1-stop-begin" -> "world2_stop_0 ubuntu_2" [ style = bold]
-"order-1-set-1-stop-begin" -> "world3_stop_0 ubuntu_2" [ style = bold]
-"order-1-set-1-stop-begin" -> "world4_stop_0 ubuntu_2" [ style = bold]
-"order-1-set-1-stop-begin" [ style=bold color="green" fontcolor="orange"  ]
-"order-1-set-1-stop-end" [ style=bold color="green" fontcolor="orange"  ]
 "world1_monitor_10000 ubuntu_1" [ style=bold color="green" fontcolor="black"  ]
-"world1_start_0 ubuntu_1" -> "order-1-set-1-start-end" [ style = bold]
 "world1_start_0 ubuntu_1" -> "world1_monitor_10000 ubuntu_1" [ style = bold]
 "world1_start_0 ubuntu_1" -> "world2_start_0 ubuntu_1" [ style = bold]
 "world1_start_0 ubuntu_1" [ style=bold color="green" fontcolor="black"  ]
 "world1_stop_0 ubuntu_2" -> "all_stopped" [ style = bold]
-"world1_stop_0 ubuntu_2" -> "order-1-set-1-stop-end" [ style = bold]
 "world1_stop_0 ubuntu_2" -> "world1_start_0 ubuntu_1" [ style = bold]
 "world1_stop_0 ubuntu_2" [ style=bold color="green" fontcolor="black"  ]
 "world2_monitor_10000 ubuntu_1" [ style=bold color="green" fontcolor="black"  ]
-"world2_start_0 ubuntu_1" -> "order-1-set-1-start-end" [ style = bold]
 "world2_start_0 ubuntu_1" -> "world2_monitor_10000 ubuntu_1" [ style = bold]
 "world2_start_0 ubuntu_1" -> "world3_start_0 ubuntu_1" [ style = bold]
 "world2_start_0 ubuntu_1" [ style=bold color="green" fontcolor="black"  ]
 "world2_stop_0 ubuntu_2" -> "all_stopped" [ style = bold]
-"world2_stop_0 ubuntu_2" -> "order-1-set-1-stop-end" [ style = bold]
 "world2_stop_0 ubuntu_2" -> "world1_stop_0 ubuntu_2" [ style = bold]
 "world2_stop_0 ubuntu_2" -> "world2_start_0 ubuntu_1" [ style = bold]
 "world2_stop_0 ubuntu_2" [ style=bold color="green" fontcolor="black"  ]
 "world3_monitor_10000 ubuntu_1" [ style=bold color="green" fontcolor="black"  ]
-"world3_start_0 ubuntu_1" -> "order-1-set-1-start-end" [ style = bold]
 "world3_start_0 ubuntu_1" -> "world3_monitor_10000 ubuntu_1" [ style = bold]
 "world3_start_0 ubuntu_1" -> "world4_start_0 ubuntu_1" [ style = bold]
 "world3_start_0 ubuntu_1" [ style=bold color="green" fontcolor="black"  ]
 "world3_stop_0 ubuntu_2" -> "all_stopped" [ style = bold]
-"world3_stop_0 ubuntu_2" -> "order-1-set-1-stop-end" [ style = bold]
 "world3_stop_0 ubuntu_2" -> "world2_stop_0 ubuntu_2" [ style = bold]
 "world3_stop_0 ubuntu_2" -> "world3_start_0 ubuntu_1" [ style = bold]
 "world3_stop_0 ubuntu_2" [ style=bold color="green" fontcolor="black"  ]
 "world4_monitor_10000 ubuntu_1" [ style=bold color="green" fontcolor="black"  ]
-"world4_start_0 ubuntu_1" -> "order-1-set-1-start-end" [ style = bold]
 "world4_start_0 ubuntu_1" -> "world4_monitor_10000 ubuntu_1" [ style = bold]
 "world4_start_0 ubuntu_1" [ style=bold color="green" fontcolor="black"  ]
 "world4_stop_0 ubuntu_2" -> "all_stopped" [ style = bold]
-"world4_stop_0 ubuntu_2" -> "order-1-set-1-stop-end" [ style = bold]
 "world4_stop_0 ubuntu_2" -> "world3_stop_0 ubuntu_2" [ style = bold]
 "world4_stop_0 ubuntu_2" -> "world4_start_0 ubuntu_1" [ style = bold]
 "world4_stop_0 ubuntu_2" [ style=bold color="green" fontcolor="black"  ]
 }
diff --git a/pengine/test10/order-sets.exp b/pengine/test10/order-sets.exp
index c457083d10..e0e9665232 100644
--- a/pengine/test10/order-sets.exp
+++ b/pengine/test10/order-sets.exp
@@ -1,268 +1,185 @@
 <transition_graph cluster-delay="5s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
   <synapse id="0">
     <action_set>
-      <rsc_op id="13" operation="stop" operation_key="world1_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2">
+      <rsc_op id="9" operation="stop" operation_key="world1_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2">
         <primitive id="world1" long-id="world1" class="ocf" provider="bbnd" type="world1test"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="8" operation="order-1-set-1-stop-begin" operation_key="order-1-set-1-stop-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="16" operation="stop" operation_key="world2_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="12" operation="stop" operation_key="world2_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="1">
     <action_set>
-      <rsc_op id="14" operation="start" operation_key="world1_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
+      <rsc_op id="10" operation="start" operation_key="world1_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
         <primitive id="world1" long-id="world1" class="ocf" provider="bbnd" type="world1test"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="order-1-set-1-start-begin" operation_key="order-1-set-1-start-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="13" operation="stop" operation_key="world1_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="9" operation="stop" operation_key="world1_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="2">
     <action_set>
-      <rsc_op id="15" operation="monitor" operation_key="world1_monitor_10000" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
+      <rsc_op id="11" operation="monitor" operation_key="world1_monitor_10000" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
         <primitive id="world1" long-id="world1" class="ocf" provider="bbnd" type="world1test"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_requires="nothing" CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="14" operation="start" operation_key="world1_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
+        <rsc_op id="10" operation="start" operation_key="world1_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="3">
     <action_set>
-      <rsc_op id="16" operation="stop" operation_key="world2_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2">
+      <rsc_op id="12" operation="stop" operation_key="world2_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2">
         <primitive id="world2" long-id="world2" class="ocf" provider="bbnd" type="world2test"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="8" operation="order-1-set-1-stop-begin" operation_key="order-1-set-1-stop-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="19" operation="stop" operation_key="world3_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="15" operation="stop" operation_key="world3_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="4">
     <action_set>
-      <rsc_op id="17" operation="start" operation_key="world2_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
+      <rsc_op id="13" operation="start" operation_key="world2_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
         <primitive id="world2" long-id="world2" class="ocf" provider="bbnd" type="world2test"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="order-1-set-1-start-begin" operation_key="order-1-set-1-start-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="14" operation="start" operation_key="world1_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
+        <rsc_op id="10" operation="start" operation_key="world1_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
       </trigger>
       <trigger>
-        <rsc_op id="16" operation="stop" operation_key="world2_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="12" operation="stop" operation_key="world2_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="5">
     <action_set>
-      <rsc_op id="18" operation="monitor" operation_key="world2_monitor_10000" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
+      <rsc_op id="14" operation="monitor" operation_key="world2_monitor_10000" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
         <primitive id="world2" long-id="world2" class="ocf" provider="bbnd" type="world2test"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_requires="nothing" CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="17" operation="start" operation_key="world2_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
+        <rsc_op id="13" operation="start" operation_key="world2_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="6">
     <action_set>
-      <rsc_op id="19" operation="stop" operation_key="world3_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2">
+      <rsc_op id="15" operation="stop" operation_key="world3_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2">
         <primitive id="world3" long-id="world3" class="ocf" provider="bbnd" type="world3test"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="8" operation="order-1-set-1-stop-begin" operation_key="order-1-set-1-stop-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="22" operation="stop" operation_key="world4_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="18" operation="stop" operation_key="world4_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="7">
     <action_set>
-      <rsc_op id="20" operation="start" operation_key="world3_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
+      <rsc_op id="16" operation="start" operation_key="world3_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
         <primitive id="world3" long-id="world3" class="ocf" provider="bbnd" type="world3test"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="order-1-set-1-start-begin" operation_key="order-1-set-1-start-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="17" operation="start" operation_key="world2_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
+        <rsc_op id="13" operation="start" operation_key="world2_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
       </trigger>
       <trigger>
-        <rsc_op id="19" operation="stop" operation_key="world3_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="15" operation="stop" operation_key="world3_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="8">
     <action_set>
-      <rsc_op id="21" operation="monitor" operation_key="world3_monitor_10000" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
+      <rsc_op id="17" operation="monitor" operation_key="world3_monitor_10000" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
         <primitive id="world3" long-id="world3" class="ocf" provider="bbnd" type="world3test"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_requires="nothing" CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="20" operation="start" operation_key="world3_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
+        <rsc_op id="16" operation="start" operation_key="world3_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="9">
     <action_set>
-      <rsc_op id="22" operation="stop" operation_key="world4_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2">
+      <rsc_op id="18" operation="stop" operation_key="world4_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2">
         <primitive id="world4" long-id="world4" class="ocf" provider="bbnd" type="world4test"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
-    <inputs>
-      <trigger>
-        <pseudo_event id="8" operation="order-1-set-1-stop-begin" operation_key="order-1-set-1-stop-begin"/>
-      </trigger>
-    </inputs>
+    <inputs/>
   </synapse>
   <synapse id="10">
     <action_set>
-      <rsc_op id="23" operation="start" operation_key="world4_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
+      <rsc_op id="19" operation="start" operation_key="world4_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
         <primitive id="world4" long-id="world4" class="ocf" provider="bbnd" type="world4test"/>
         <attributes CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <pseudo_event id="6" operation="order-1-set-1-start-begin" operation_key="order-1-set-1-start-begin"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="20" operation="start" operation_key="world3_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
+        <rsc_op id="16" operation="start" operation_key="world3_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
       </trigger>
       <trigger>
-        <rsc_op id="22" operation="stop" operation_key="world4_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="18" operation="stop" operation_key="world4_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="11">
     <action_set>
-      <rsc_op id="24" operation="monitor" operation_key="world4_monitor_10000" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
+      <rsc_op id="20" operation="monitor" operation_key="world4_monitor_10000" on_node="ubuntu_1" on_node_uuid="ubuntu_1">
         <primitive id="world4" long-id="world4" class="ocf" provider="bbnd" type="world4test"/>
         <attributes CRM_meta_interval="10000" CRM_meta_name="monitor" CRM_meta_on_fail="restart" CRM_meta_requires="nothing" CRM_meta_timeout="20000" crm_feature_set="3.0.2"/>
       </rsc_op>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="23" operation="start" operation_key="world4_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
+        <rsc_op id="19" operation="start" operation_key="world4_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
       </trigger>
     </inputs>
   </synapse>
   <synapse id="12">
     <action_set>
-      <pseudo_event id="5" operation="order-1-set-1-start-end" operation_key="order-1-set-1-start-end">
-        <attributes crm_feature_set="3.0.2"/>
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="14" operation="start" operation_key="world1_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="17" operation="start" operation_key="world2_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="20" operation="start" operation_key="world3_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="23" operation="start" operation_key="world4_start_0" on_node="ubuntu_1" on_node_uuid="ubuntu_1"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="13">
-    <action_set>
-      <pseudo_event id="6" operation="order-1-set-1-start-begin" operation_key="order-1-set-1-start-begin">
-        <attributes crm_feature_set="3.0.2"/>
-      </pseudo_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="14">
-    <action_set>
-      <pseudo_event id="7" operation="order-1-set-1-stop-end" operation_key="order-1-set-1-stop-end">
-        <attributes crm_feature_set="3.0.2"/>
-      </pseudo_event>
-    </action_set>
-    <inputs>
-      <trigger>
-        <rsc_op id="13" operation="stop" operation_key="world1_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="16" operation="stop" operation_key="world2_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="19" operation="stop" operation_key="world3_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
-      </trigger>
-      <trigger>
-        <rsc_op id="22" operation="stop" operation_key="world4_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
-      </trigger>
-    </inputs>
-  </synapse>
-  <synapse id="15">
-    <action_set>
-      <pseudo_event id="8" operation="order-1-set-1-stop-begin" operation_key="order-1-set-1-stop-begin">
-        <attributes crm_feature_set="3.0.2"/>
-      </pseudo_event>
-    </action_set>
-    <inputs/>
-  </synapse>
-  <synapse id="16">
-    <action_set>
-      <pseudo_event id="9" operation="all_stopped" operation_key="all_stopped">
+      <pseudo_event id="5" operation="all_stopped" operation_key="all_stopped">
         <attributes crm_feature_set="3.0.2"/>
       </pseudo_event>
     </action_set>
     <inputs>
       <trigger>
-        <rsc_op id="13" operation="stop" operation_key="world1_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="9" operation="stop" operation_key="world1_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
       <trigger>
-        <rsc_op id="16" operation="stop" operation_key="world2_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="12" operation="stop" operation_key="world2_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
       <trigger>
-        <rsc_op id="19" operation="stop" operation_key="world3_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="15" operation="stop" operation_key="world3_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
       <trigger>
-        <rsc_op id="22" operation="stop" operation_key="world4_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
+        <rsc_op id="18" operation="stop" operation_key="world4_stop_0" on_node="ubuntu_2" on_node_uuid="ubuntu_2"/>
       </trigger>
     </inputs>
   </synapse>
 </transition_graph>