diff --git a/examples/bts/fsetint/why3session.xml b/examples/bts/fsetint/why3session.xml
index b36b2ed095cd37b00ef3a3619054ec03c8e4d70b..ca0e5179b6ce6ff4d21ab364179c0b92db286144 100644
--- a/examples/bts/fsetint/why3session.xml
+++ b/examples/bts/fsetint/why3session.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE why3session SYSTEM "/home/cmarche/recherche/why3/share/why3session.dtd">
+<!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
- name="bts/fsetint/why3session.xml" shape_version="2">
+ name="examples/bts/fsetint/why3session.xml" shape_version="2">
  <prover
   id="0"
   name="Alt-Ergo"
@@ -32,36 +32,36 @@
   expanded="true">
   <theory
    name="Th1"
-   locfile="bts/fsetint/../fsetint.why"
+   locfile="examples/bts/fsetint/../fsetint.why"
    loclnum="2" loccnumb="7" loccnume="10"
    verified="false"
    expanded="true">
    <goal
     name="l_false"
-    locfile="bts/fsetint/../fsetint.why"
+    locfile="examples/bts/fsetint/../fsetint.why"
     loclnum="5" loccnumb="9" loccnume="16"
-    sum="d7f2aebfd2edd578b1a93cf604aec178"
+    sum="c947d53d28f83e6855846af79dd2fd23"
     proved="false"
     expanded="true"
     shape="f">
     <proof
-     prover="1"
+     prover="0"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="unknown" time="0.01"/>
+     <result status="unknown" time="0.02"/>
     </proof>
     <proof
-     prover="0"
+     prover="1"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="unknown" time="0.02"/>
+     <result status="unknown" time="0.01"/>
     </proof>
     <proof
-     prover="3"
+     prover="2"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -69,7 +69,7 @@
      <result status="timeout" time="3.01"/>
     </proof>
     <proof
-     prover="4"
+     prover="3"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -77,7 +77,7 @@
      <result status="timeout" time="3.01"/>
     </proof>
     <proof
-     prover="2"
+     prover="4"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -96,20 +96,20 @@
   </theory>
   <theory
    name="Th2"
-   locfile="bts/fsetint/../fsetint.why"
+   locfile="examples/bts/fsetint/../fsetint.why"
    loclnum="9" loccnumb="7" loccnume="10"
    verified="false"
    expanded="true">
    <goal
     name="mem_integer"
-    locfile="bts/fsetint/../fsetint.why"
+    locfile="examples/bts/fsetint/../fsetint.why"
     loclnum="13" loccnumb="8" loccnume="19"
-    sum="242bf143cc8b33512505c233039239e5"
+    sum="7955f9947fe99d987021ad54e5134999"
     proved="false"
     expanded="true"
     shape="amemV0aintegerF">
     <proof
-     prover="1"
+     prover="0"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -117,7 +117,7 @@
      <result status="unknown" time="0.00"/>
     </proof>
     <proof
-     prover="0"
+     prover="1"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -125,28 +125,28 @@
      <result status="unknown" time="0.00"/>
     </proof>
     <proof
-     prover="3"
+     prover="2"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="timeout" time="3.11"/>
+     <result status="timeout" time="3.02"/>
     </proof>
     <proof
-     prover="4"
+     prover="3"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="timeout" time="3.01"/>
+     <result status="timeout" time="3.11"/>
     </proof>
     <proof
-     prover="2"
+     prover="4"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="timeout" time="3.02"/>
+     <result status="timeout" time="3.01"/>
     </proof>
     <proof
      prover="5"
@@ -159,14 +159,14 @@
    </goal>
    <goal
     name="foo"
-    locfile="bts/fsetint/../fsetint.why"
+    locfile="examples/bts/fsetint/../fsetint.why"
     loclnum="15" loccnumb="7" loccnume="10"
-    sum="80ba20b39cf0e3e682e5c0d84d596f36"
+    sum="1b9f1948f208c84cec8e9d3afbc69215"
     proved="false"
     expanded="true"
     shape="f">
     <proof
-     prover="1"
+     prover="0"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -174,7 +174,7 @@
      <result status="unknown" time="0.00"/>
     </proof>
     <proof
-     prover="0"
+     prover="1"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -182,7 +182,7 @@
      <result status="unknown" time="0.00"/>
     </proof>
     <proof
-     prover="3"
+     prover="2"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -190,20 +190,20 @@
      <result status="timeout" time="3.11"/>
     </proof>
     <proof
-     prover="4"
+     prover="3"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="timeout" time="3.01"/>
+     <result status="timeout" time="3.11"/>
     </proof>
     <proof
-     prover="2"
+     prover="4"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="timeout" time="3.11"/>
+     <result status="timeout" time="3.01"/>
     </proof>
     <proof
      prover="5"
@@ -217,20 +217,20 @@
   </theory>
   <theory
    name="Th3"
-   locfile="bts/fsetint/../fsetint.why"
+   locfile="examples/bts/fsetint/../fsetint.why"
    loclnum="20" loccnumb="7" loccnume="10"
    verified="false"
    expanded="true">
    <goal
     name="foo"
-    locfile="bts/fsetint/../fsetint.why"
+    locfile="examples/bts/fsetint/../fsetint.why"
     loclnum="30" loccnumb="7" loccnume="10"
     sum="ee9eb17e39034c473cffb6f065106935"
     proved="false"
     expanded="true"
     shape="f">
     <proof
-     prover="1"
+     prover="0"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -238,7 +238,7 @@
      <result status="unknown" time="0.00"/>
     </proof>
     <proof
-     prover="0"
+     prover="1"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -246,7 +246,7 @@
      <result status="unknown" time="0.00"/>
     </proof>
     <proof
-     prover="3"
+     prover="2"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -254,20 +254,20 @@
      <result status="unknown" time="0.00"/>
     </proof>
     <proof
-     prover="4"
+     prover="3"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="unknown" time="0.01"/>
+     <result status="unknown" time="0.00"/>
     </proof>
     <proof
-     prover="2"
+     prover="4"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="unknown" time="0.00"/>
+     <result status="unknown" time="0.01"/>
     </proof>
     <proof
      prover="5"
diff --git a/examples/foveoos2011/tree_max/why3session.xml b/examples/foveoos2011/tree_max/why3session.xml
index 338ecf73a3e16c19bc8128f6794b6b77f4302e62..2c846ab7f37f818e4a3d4d4dc551db40b3b9d75d 100644
--- a/examples/foveoos2011/tree_max/why3session.xml
+++ b/examples/foveoos2011/tree_max/why3session.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE why3session SYSTEM "/users/demons/melquion/src/why3/share/why3session.dtd">
+<!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
  name="foveoos2011/tree_max/why3session.xml" shape_version="2">
  <prover
@@ -50,10 +50,10 @@
     locfile="foveoos2011/tree_max/../tree_max.mlw"
     loclnum="58" loccnumb="10" loccnume="17"
     expl="parameter max_aux"
-    sum="9fc59bad6ad8d5848304ed16ba8aba48"
+    sum="ff881f65aef0140a6dfc905eb5fda89a"
     proved="true"
     expanded="true"
-    shape="CV0aNullainfix &gt;=V1V1Aage_treeV1V0aTreeVVVamemV6V0Oainfix =V6V1Aainfix &gt;=V6V1Aage_treeV6V0IamemV6V3Oainfix =V6V5Aainfix &gt;=V6V5Aage_treeV6V3FIamemV5V4Oainfix =V5amaxV2V1Aainfix &gt;=V5amaxV2V1Aage_treeV5V4FF">
+    shape="CV0aNullainfix &gt;=V1V1Aage_treeV1V0aTreeVVVamemV6V0Oainfix =V6V1Aainfix &gt;=V6V1Aage_treeV6V0IamemV6V3Oainfix =V6V5Aainfix &gt;=V6V5Aage_treeV6V3FACV0aNullfaTreewVVainfix =V8V3Oainfix =V7V3IamemV5V4Oainfix =V5amaxV2V1Aainfix &gt;=V5amaxV2V1Aage_treeV5V4FACV0aNullfaTreewVVainfix =V10V4Oainfix =V9V4F">
     <label
      name="expl:parameter max_aux"/>
     <proof
@@ -68,8 +68,8 @@
    <goal
     name="WP_parameter max"
     locfile="foveoos2011/tree_max/../tree_max.mlw"
-    loclnum="68" loccnumb="6" loccnume="9"
-    expl="parameter max"
+    loclnum="67" loccnumb="6" loccnume="9"
+    expl="postcondition"
     sum="28e5d856901e66fadb02844681ad3b11"
     proved="true"
     expanded="true"
diff --git a/examples/programs/alphaBeta/why3session.xml b/examples/programs/alphaBeta/why3session.xml
index 7bbb784bf43d807d3271f4bbb8f757c05f318dcf..778251c45364f804aa5726d9ca863f5ef93d39ac 100644
--- a/examples/programs/alphaBeta/why3session.xml
+++ b/examples/programs/alphaBeta/why3session.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE why3session SYSTEM "/home/marche/why3/share/why3session.dtd">
+<!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
- name="alphaBeta/why3session.xml" shape_version="2">
+ name="examples/programs/alphaBeta/why3session.xml" shape_version="2">
  <prover
   id="0"
   name="Alt-Ergo"
@@ -44,51 +44,51 @@
   expanded="true">
   <theory
    name="TwoPlayerGame"
-   locfile="alphaBeta/../alphaBeta.mlw"
+   locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
    loclnum="2" loccnumb="7" loccnume="20"
    verified="true"
-   expanded="true">
+   expanded="false">
    <goal
     name="Test"
-    locfile="alphaBeta/../alphaBeta.mlw"
+    locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
     loclnum="76" loccnumb="7" loccnume="11"
-    sum="dddfa1ad0dedafc3ffa6d6d2ffdc8345"
+    sum="5a090932a31ec1b1207f5e1f9a4b78f5"
     proved="true"
-    expanded="true"
+    expanded="false"
     shape="ainfix &lt;=aprefix -aposition_valueado_moveV0V1aminmaxV0c1IamemV1V2Lalegal_movesV0F">
     <proof
-     prover="6"
+     prover="5"
      timelimit="10"
      memlimit="1000"
+     edited="alphaBeta_TwoPlayerGame_Test_1.v"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.03"/>
+     <result status="valid" time="0.51"/>
     </proof>
     <proof
-     prover="7"
+     prover="6"
      timelimit="10"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.05"/>
+     <result status="valid" time="0.03"/>
     </proof>
     <proof
-     prover="5"
+     prover="7"
      timelimit="10"
      memlimit="1000"
-     edited="alphaBeta_TwoPlayerGame_Test_1.v"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.51"/>
+     <result status="valid" time="0.05"/>
     </proof>
    </goal>
    <goal
     name="minmax_bound"
-    locfile="alphaBeta/../alphaBeta.mlw"
+    locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
     loclnum="82" loccnumb="8" loccnume="20"
-    sum="917c0cf03e4aa5a2633dec99d30d80ea"
+    sum="854562e6024ee5671d836dd65bb41265"
     proved="true"
-    expanded="true"
+    expanded="false"
     shape="ainfix &lt;aminmaxV0V1ainfinityAainfix &lt;aprefix -ainfinityaminmaxV0V1Iainfix &gt;=V1c0F">
     <proof
      prover="5"
@@ -102,30 +102,30 @@
    </goal>
    <goal
     name="minmax_nomove"
-    locfile="alphaBeta/../alphaBeta.mlw"
+    locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
     loclnum="86" loccnumb="8" loccnume="21"
-    sum="c03ebf9fa83902dfbb8ee2a062065d13"
+    sum="4479f9caabc0235ea9e30dca6db09d05"
     proved="true"
-    expanded="true"
+    expanded="false"
     shape="ainfix =aminmaxV0V1aposition_valueV0Iainfix =alegal_movesV0aNilAainfix &gt;=V1c0F">
     <proof
-     prover="6"
+     prover="0"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.02"/>
+     <result status="valid" time="0.09"/>
     </proof>
     <proof
-     prover="3"
+     prover="1"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.01"/>
+     <result status="valid" time="0.02"/>
     </proof>
     <proof
-     prover="1"
+     prover="2"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -133,12 +133,12 @@
      <result status="valid" time="0.02"/>
     </proof>
     <proof
-     prover="0"
+     prover="3"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.09"/>
+     <result status="valid" time="0.01"/>
     </proof>
     <proof
      prover="4"
@@ -149,7 +149,7 @@
      <result status="valid" time="0.01"/>
     </proof>
     <proof
-     prover="8"
+     prover="6"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -165,7 +165,7 @@
      <result status="valid" time="0.02"/>
     </proof>
     <proof
-     prover="2"
+     prover="8"
      timelimit="3"
      memlimit="1000"
      obsolete="false"
@@ -176,54 +176,54 @@
   </theory>
   <theory
    name="AlphaBeta"
-   locfile="alphaBeta/../alphaBeta.mlw"
+   locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
    loclnum="99" loccnumb="7" loccnume="16"
    verified="false"
    expanded="true">
    <goal
     name="WP_parameter move_value_alpha_beta"
-    locfile="alphaBeta/../alphaBeta.mlw"
+    locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
     loclnum="109" loccnumb="10" loccnume="31"
     expl="parameter move_value_alpha_beta"
-    sum="9e6527d21ba9d38bcab4d502f9e89bbd"
+    sum="4b336999e03530776848914d6a2e8af9"
     proved="true"
-    expanded="true"
+    expanded="false"
     shape="iainfix &lt;V6aprefix -V0Aainfix &lt;aprefix -V1V6ainfix =aprefix -V5aprefix -V6iainfix &lt;=V6aprefix -V1ainfix &gt;=aprefix -V5V1ainfix &lt;=aprefix -V5V0Laminmaxado_moveV2V4ainfix -V3c1Iiainfix &lt;aminmaxado_moveV2V4ainfix -V3c1aprefix -V0Aainfix &lt;aprefix -V1aminmaxado_moveV2V4ainfix -V3c1ainfix =V5aminmaxado_moveV2V4ainfix -V3c1iainfix &lt;=aminmaxado_moveV2V4ainfix -V3c1aprefix -V1ainfix &lt;=V5aprefix -V1ainfix &gt;=V5aprefix -V0FAainfix &gt;=ainfix -V3c1c0Iainfix &gt;=V3c1F">
     <label
      name="expl:parameter move_value_alpha_beta"/>
     <transf
      name="split_goal_wp"
      proved="true"
-     expanded="true">
+     expanded="false">
      <goal
       name="WP_parameter move_value_alpha_beta.1"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="109" loccnumb="10" loccnume="31"
       expl="precondition"
-      sum="e074602ff2bbf6a993c9cbefa307759d"
+      sum="eeb5a974014b7d7d6b993b76149033c8"
       proved="true"
-      expanded="true"
+      expanded="false"
       shape="ainfix &gt;=ainfix -V3c1c0Iainfix &gt;=V3c1F">
       <label
        name="expl:parameter move_value_alpha_beta"/>
       <proof
-       prover="6"
+       prover="0"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.00"/>
+       <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="3"
+       prover="1"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.00"/>
+       <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="1"
+       prover="2"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
@@ -231,12 +231,12 @@
        <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="0"
+       prover="3"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.00"/>
       </proof>
       <proof
        prover="4"
@@ -247,7 +247,7 @@
        <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="8"
+       prover="6"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
@@ -263,37 +263,37 @@
        <result status="valid" time="0.00"/>
       </proof>
       <proof
-       prover="2"
+       prover="8"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.00"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter move_value_alpha_beta.2"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="109" loccnumb="10" loccnume="31"
-      expl="normal postcondition"
-      sum="9bb1b109095473086f9da0ecd837d15c"
+      expl="postcondition"
+      sum="9c52653fd676897e03b1c51d1ffafcb9"
       proved="true"
-      expanded="true"
+      expanded="false"
       shape="iainfix &lt;V6aprefix -V0Aainfix &lt;aprefix -V1V6ainfix =aprefix -V5aprefix -V6iainfix &lt;=V6aprefix -V1ainfix &gt;=aprefix -V5V1ainfix &lt;=aprefix -V5V0Laminmaxado_moveV2V4ainfix -V3c1Iiainfix &lt;aminmaxado_moveV2V4ainfix -V3c1aprefix -V0Aainfix &lt;aprefix -V1aminmaxado_moveV2V4ainfix -V3c1ainfix =V5aminmaxado_moveV2V4ainfix -V3c1iainfix &lt;=aminmaxado_moveV2V4ainfix -V3c1aprefix -V1ainfix &lt;=V5aprefix -V1ainfix &gt;=V5aprefix -V0FIainfix &gt;=ainfix -V3c1c0Iainfix &gt;=V3c1F">
       <label
        name="expl:parameter move_value_alpha_beta"/>
       <transf
        name="split_goal_wp"
        proved="true"
-       expanded="true">
+       expanded="false">
        <goal
         name="WP_parameter move_value_alpha_beta.2.1"
-        locfile="alphaBeta/../alphaBeta.mlw"
+        locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
         loclnum="109" loccnumb="10" loccnume="31"
-        expl="normal postcondition"
-        sum="0dfdb39dc09e974007a7f5ca8335c7b7"
+        expl="postcondition"
+        sum="621badca9850a33aed20f605781199a3"
         proved="true"
-        expanded="true"
+        expanded="false"
         shape="ainfix =aprefix -V5aprefix -V6Iainfix &lt;V6aprefix -V0Aainfix &lt;aprefix -V1V6Laminmaxado_moveV2V4ainfix -V3c1Iiainfix &lt;aminmaxado_moveV2V4ainfix -V3c1aprefix -V0Aainfix &lt;aprefix -V1aminmaxado_moveV2V4ainfix -V3c1ainfix =V5aminmaxado_moveV2V4ainfix -V3c1iainfix &lt;=aminmaxado_moveV2V4ainfix -V3c1aprefix -V1ainfix &lt;=V5aprefix -V1ainfix &gt;=V5aprefix -V0FIainfix &gt;=ainfix -V3c1c0Iainfix &gt;=V3c1F">
         <label
          name="expl:parameter move_value_alpha_beta"/>
@@ -308,12 +308,12 @@
        </goal>
        <goal
         name="WP_parameter move_value_alpha_beta.2.2"
-        locfile="alphaBeta/../alphaBeta.mlw"
+        locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
         loclnum="109" loccnumb="10" loccnume="31"
-        expl="normal postcondition"
-        sum="a03b404ab754b5968d5c13c275d8b2d8"
+        expl="postcondition"
+        sum="5397719394aa372abe40ac343bd54032"
         proved="true"
-        expanded="true"
+        expanded="false"
         shape="ainfix &gt;=aprefix -V5V1Iainfix &lt;=V6aprefix -V1Iainfix &lt;V6aprefix -V0Aainfix &lt;aprefix -V1V6NLaminmaxado_moveV2V4ainfix -V3c1Iiainfix &lt;aminmaxado_moveV2V4ainfix -V3c1aprefix -V0Aainfix &lt;aprefix -V1aminmaxado_moveV2V4ainfix -V3c1ainfix =V5aminmaxado_moveV2V4ainfix -V3c1iainfix &lt;=aminmaxado_moveV2V4ainfix -V3c1aprefix -V1ainfix &lt;=V5aprefix -V1ainfix &gt;=V5aprefix -V0FIainfix &gt;=ainfix -V3c1c0Iainfix &gt;=V3c1F">
         <label
          name="expl:parameter move_value_alpha_beta"/>
@@ -328,12 +328,12 @@
        </goal>
        <goal
         name="WP_parameter move_value_alpha_beta.2.3"
-        locfile="alphaBeta/../alphaBeta.mlw"
+        locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
         loclnum="109" loccnumb="10" loccnume="31"
-        expl="normal postcondition"
-        sum="74363ae1536b97aa807e399616bd6492"
+        expl="postcondition"
+        sum="b77bd164cdcb4c16f5345cef2293106e"
         proved="true"
-        expanded="true"
+        expanded="false"
         shape="ainfix &lt;=aprefix -V5V0Iainfix &lt;=V6aprefix -V1NIainfix &lt;V6aprefix -V0Aainfix &lt;aprefix -V1V6NLaminmaxado_moveV2V4ainfix -V3c1Iiainfix &lt;aminmaxado_moveV2V4ainfix -V3c1aprefix -V0Aainfix &lt;aprefix -V1aminmaxado_moveV2V4ainfix -V3c1ainfix =V5aminmaxado_moveV2V4ainfix -V3c1iainfix &lt;=aminmaxado_moveV2V4ainfix -V3c1aprefix -V1ainfix &lt;=V5aprefix -V1ainfix &gt;=V5aprefix -V0FIainfix &gt;=ainfix -V3c1c0Iainfix &gt;=V3c1F">
         <label
          name="expl:parameter move_value_alpha_beta"/>
@@ -352,10 +352,10 @@
    </goal>
    <goal
     name="WP_parameter negabeta"
-    locfile="alphaBeta/../alphaBeta.mlw"
+    locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
     loclnum="121" loccnumb="7" loccnume="15"
     expl="parameter negabeta"
-    sum="a04ea308b9a5928f077602040310df2e"
+    sum="e3e4cf03bf565f55a66abae9f6482b89"
     proved="false"
     expanded="true"
     shape="iainfix =V3c0iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3ainfix =aposition_valueV2aminmaxV2V3iainfix &lt;=aminmaxV2V3V0ainfix &lt;=aposition_valueV2V0ainfix &gt;=aposition_valueV2V1Calegal_movesV2aNiliainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3ainfix =aposition_valueV2aminmaxV2V3iainfix &lt;=aminmaxV2V3V0ainfix &lt;=aposition_valueV2V0ainfix &gt;=aposition_valueV2V1aConsVViainfix &gt;=V6V1iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3ainfix =V6aminmaxV2V3iainfix &lt;=aminmaxV2V3V0ainfix &lt;=V6V0ainfix &gt;=V6V1iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3ainfix =V7aminmaxV2V3iainfix &lt;=aminmaxV2V3V0ainfix &lt;=V7V0ainfix &gt;=V7V1Iiais_emptyV8ainfix =V7V6iainfix &lt;V9V1Aainfix &lt;amaxV6V0V9ainfix =V7V9iainfix &lt;=V9amaxV6V0ainfix &lt;=V7amaxV6V0ainfix &gt;=V7V1LaminaTuple2V2V3V8LaelementsV5FAainfix &gt;=V3c1Iiainfix &lt;V10aprefix -V0Aainfix &lt;aprefix -V1V10ainfix =V6aprefix -V10iainfix &lt;=V10aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FAainfix &gt;=V3c1Iainfix &gt;=V3c0F">
@@ -367,12 +367,12 @@
      expanded="true">
      <goal
       name="WP_parameter negabeta.1"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="121" loccnumb="7" loccnume="15"
-      expl="normal postcondition"
-      sum="a9b55032c2ea9f2f3c5484857af06ff9"
+      expl="postcondition"
+      sum="a1967aa71794b94a6a6cdf55a3f041b9"
       proved="true"
-      expanded="true"
+      expanded="false"
       shape="iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3ainfix =aposition_valueV2aminmaxV2V3iainfix &lt;=aminmaxV2V3V0ainfix &lt;=aposition_valueV2V0ainfix &gt;=aposition_valueV2V1Iainfix =V3c0Iainfix &gt;=V3c0F">
       <label
        name="expl:parameter negabeta"/>
@@ -387,48 +387,48 @@
       <transf
        name="split_goal_wp"
        proved="true"
-       expanded="true">
+       expanded="false">
        <goal
         name="WP_parameter negabeta.1.1"
-        locfile="alphaBeta/../alphaBeta.mlw"
+        locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
         loclnum="121" loccnumb="7" loccnume="15"
-        expl="normal postcondition"
-        sum="38d94bffcfc8e7f1cd87a9d3c0dcf9ab"
+        expl="postcondition"
+        sum="9183e44c5ea7153046c81e84ebd30ad5"
         proved="true"
-        expanded="true"
+        expanded="false"
         shape="ainfix =aposition_valueV2aminmaxV2V3Iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3Iainfix =V3c0Iainfix &gt;=V3c0F">
         <label
          name="expl:parameter negabeta"/>
         <proof
-         prover="8"
+         prover="7"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.02"/>
+         <result status="valid" time="0.01"/>
         </proof>
         <proof
-         prover="7"
+         prover="8"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.01"/>
+         <result status="valid" time="0.02"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter negabeta.1.2"
-        locfile="alphaBeta/../alphaBeta.mlw"
+        locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
         loclnum="121" loccnumb="7" loccnume="15"
-        expl="normal postcondition"
-        sum="aaa0ccfa902ac036a3e00e54ac94c2dd"
+        expl="postcondition"
+        sum="9ce23df25b9fda3007e2ab86e983ac45"
         proved="true"
-        expanded="true"
+        expanded="false"
         shape="ainfix &lt;=aposition_valueV2V0Iainfix &lt;=aminmaxV2V3V0Iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3NIainfix =V3c0Iainfix &gt;=V3c0F">
         <label
          name="expl:parameter negabeta"/>
         <proof
-         prover="8"
+         prover="7"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -436,7 +436,7 @@
          <result status="valid" time="0.02"/>
         </proof>
         <proof
-         prover="7"
+         prover="8"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -446,17 +446,17 @@
        </goal>
        <goal
         name="WP_parameter negabeta.1.3"
-        locfile="alphaBeta/../alphaBeta.mlw"
+        locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
         loclnum="121" loccnumb="7" loccnume="15"
-        expl="normal postcondition"
-        sum="3c4de9802bca430c9294fe298f403bd7"
+        expl="postcondition"
+        sum="f92e21601b3e39a709717cc78dec5a9a"
         proved="true"
-        expanded="true"
+        expanded="false"
         shape="ainfix &gt;=aposition_valueV2V1Iainfix &lt;=aminmaxV2V3V0NIainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3NIainfix =V3c0Iainfix &gt;=V3c0F">
         <label
          name="expl:parameter negabeta"/>
         <proof
-         prover="8"
+         prover="7"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -464,7 +464,7 @@
          <result status="valid" time="0.02"/>
         </proof>
         <proof
-         prover="7"
+         prover="8"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -476,27 +476,27 @@
      </goal>
      <goal
       name="WP_parameter negabeta.2"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="121" loccnumb="7" loccnume="15"
-      expl="parameter negabeta"
-      sum="eb0ad391218d7e9d73aa948a67a12189"
+      expl="postcondition"
+      sum="20ae207f8e475810b8d8c8ab2a606c9d"
       proved="true"
-      expanded="true"
+      expanded="false"
       shape="Calegal_movesV2aNiliainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3ainfix =aposition_valueV2aminmaxV2V3iainfix &lt;=aminmaxV2V3V0ainfix &lt;=aposition_valueV2V0ainfix &gt;=aposition_valueV2V1aConsVVtIainfix =V3c0NIainfix &gt;=V3c0F">
       <label
        name="expl:parameter negabeta"/>
       <transf
        name="split_goal_wp"
        proved="true"
-       expanded="true">
+       expanded="false">
        <goal
         name="WP_parameter negabeta.2.1"
-        locfile="alphaBeta/../alphaBeta.mlw"
+        locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
         loclnum="121" loccnumb="7" loccnume="15"
-        expl="parameter negabeta"
-        sum="bd9e6cdfb2c6c6b38f3074456e5242b0"
+        expl="postcondition"
+        sum="b5ec68786af90c40fd3c6ca7d9a80d3e"
         proved="true"
-        expanded="true"
+        expanded="false"
         shape="Calegal_movesV2aNilainfix =aposition_valueV2aminmaxV2V3Iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3aConsVVtIainfix =V3c0NIainfix &gt;=V3c0F">
         <label
          name="expl:parameter negabeta"/>
@@ -509,7 +509,7 @@
          <result status="valid" time="0.01"/>
         </proof>
         <proof
-         prover="8"
+         prover="7"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -517,7 +517,7 @@
          <result status="valid" time="0.02"/>
         </proof>
         <proof
-         prover="7"
+         prover="8"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -527,12 +527,12 @@
        </goal>
        <goal
         name="WP_parameter negabeta.2.2"
-        locfile="alphaBeta/../alphaBeta.mlw"
+        locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
         loclnum="121" loccnumb="7" loccnume="15"
-        expl="parameter negabeta"
-        sum="f7f5363848c92a449dd5b96a24ac89c9"
+        expl="postcondition"
+        sum="ffe39a0705cea025b1183db6092d8e05"
         proved="true"
-        expanded="true"
+        expanded="false"
         shape="Calegal_movesV2aNilainfix &lt;=aposition_valueV2V0Iainfix &lt;=aminmaxV2V3V0Iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3NaConsVVtIainfix =V3c0NIainfix &gt;=V3c0F">
         <label
          name="expl:parameter negabeta"/>
@@ -545,7 +545,7 @@
          <result status="valid" time="0.01"/>
         </proof>
         <proof
-         prover="8"
+         prover="7"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -553,7 +553,7 @@
          <result status="valid" time="0.02"/>
         </proof>
         <proof
-         prover="7"
+         prover="8"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -563,12 +563,12 @@
        </goal>
        <goal
         name="WP_parameter negabeta.2.3"
-        locfile="alphaBeta/../alphaBeta.mlw"
+        locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
         loclnum="121" loccnumb="7" loccnume="15"
-        expl="parameter negabeta"
-        sum="e9c9c8eb27358f2aa593711aed4361f3"
+        expl="postcondition"
+        sum="b40a8cb8f2f0a328b9f5cb797d30cbb6"
         proved="true"
-        expanded="true"
+        expanded="false"
         shape="Calegal_movesV2aNilainfix &gt;=aposition_valueV2V1Iainfix &lt;=aminmaxV2V3V0NIainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3NaConsVVtIainfix =V3c0NIainfix &gt;=V3c0F">
         <label
          name="expl:parameter negabeta"/>
@@ -581,7 +581,7 @@
          <result status="valid" time="0.02"/>
         </proof>
         <proof
-         prover="8"
+         prover="7"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -589,7 +589,7 @@
          <result status="valid" time="0.03"/>
         </proof>
         <proof
-         prover="7"
+         prover="8"
          timelimit="3"
          memlimit="1000"
          obsolete="false"
@@ -601,12 +601,12 @@
      </goal>
      <goal
       name="WP_parameter negabeta.3"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="121" loccnumb="7" loccnume="15"
-      expl="parameter negabeta"
-      sum="3f1ef2e372c2d45efc91112dc1101b3f"
+      expl="precondition"
+      sum="46a3bb0bbd85261da9ac452487b49020"
       proved="true"
-      expanded="true"
+      expanded="false"
       shape="Calegal_movesV2aNiltaConsVVainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
       <label
        name="expl:parameter negabeta"/>
@@ -619,131 +619,42 @@
        <result status="valid" time="0.02"/>
       </proof>
       <proof
-       prover="8"
+       prover="7"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.03"/>
+       <result status="valid" time="0.02"/>
       </proof>
       <proof
-       prover="7"
+       prover="8"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.02"/>
+       <result status="valid" time="0.03"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter negabeta.4"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="121" loccnumb="7" loccnume="15"
-      expl="parameter negabeta"
-      sum="a273bebbec6a9083a767ce0e0f4686da"
+      expl="postcondition"
+      sum="89f09febe9b359f7e11731fdc8743303"
       proved="false"
       expanded="true"
       shape="Calegal_movesV2aNiltaConsVViainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3ainfix =V6aminmaxV2V3iainfix &lt;=aminmaxV2V3V0ainfix &lt;=V6V0ainfix &gt;=V6V1Iainfix &gt;=V6V1Iiainfix &lt;V7aprefix -V0Aainfix &lt;aprefix -V1V7ainfix =V6aprefix -V7iainfix &lt;=V7aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FIainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
       <label
        name="expl:parameter negabeta"/>
-      <transf
-       name="split_goal_wp"
-       proved="false"
-       expanded="true">
-       <goal
-        name="WP_parameter negabeta.4.1"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="121" loccnumb="7" loccnume="15"
-        expl="parameter negabeta"
-        sum="9cc2a8eddab3f39be732c63853b6b725"
-        proved="false"
-        expanded="true"
-        shape="Calegal_movesV2aNiltaConsVVainfix =V6aminmaxV2V3Iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3Iainfix &gt;=V6V1Iiainfix &lt;V7aprefix -V0Aainfix &lt;aprefix -V1V7ainfix =V6aprefix -V7iainfix &lt;=V7aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FIainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
-        <label
-         name="expl:parameter negabeta"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.03"/>
-        </proof>
-        <proof
-         prover="7"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.04"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter negabeta.4.2"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="121" loccnumb="7" loccnume="15"
-        expl="parameter negabeta"
-        sum="55d9bb5bdf7027c77e2524379277afc8"
-        proved="false"
-        expanded="true"
-        shape="Calegal_movesV2aNiltaConsVVainfix &lt;=V6V0Iainfix &lt;=aminmaxV2V3V0Iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3NIainfix &gt;=V6V1Iiainfix &lt;V7aprefix -V0Aainfix &lt;aprefix -V1V7ainfix =V6aprefix -V7iainfix &lt;=V7aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FIainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
-        <label
-         name="expl:parameter negabeta"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.05"/>
-        </proof>
-        <proof
-         prover="7"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.06"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter negabeta.4.3"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="121" loccnumb="7" loccnume="15"
-        expl="parameter negabeta"
-        sum="1a583af6344bbd5b97698f37f560ce07"
-        proved="true"
-        expanded="true"
-        shape="Calegal_movesV2aNiltaConsVVainfix &gt;=V6V1Iainfix &lt;=aminmaxV2V3V0NIainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3NIainfix &gt;=V6V1Iiainfix &lt;V7aprefix -V0Aainfix &lt;aprefix -V1V7ainfix =V6aprefix -V7iainfix &lt;=V7aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FIainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
-        <label
-         name="expl:parameter negabeta"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="valid" time="0.00"/>
-        </proof>
-        <proof
-         prover="7"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="valid" time="0.00"/>
-        </proof>
-       </goal>
-      </transf>
      </goal>
      <goal
       name="WP_parameter negabeta.5"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="121" loccnumb="7" loccnume="15"
-      expl="parameter negabeta"
-      sum="1701b5119c301de6c1909893390d69c0"
+      expl="precondition"
+      sum="500ca5769932a7242df95924731a90e8"
       proved="true"
-      expanded="true"
+      expanded="false"
       shape="Calegal_movesV2aNiltaConsVVainfix &gt;=V3c1Iainfix &gt;=V6V1NIiainfix &lt;V7aprefix -V0Aainfix &lt;aprefix -V1V7ainfix =V6aprefix -V7iainfix &lt;=V7aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FIainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
       <label
        name="expl:parameter negabeta"/>
@@ -756,7 +667,7 @@
        <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="8"
+       prover="7"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
@@ -764,7 +675,7 @@
        <result status="valid" time="0.02"/>
       </proof>
       <proof
-       prover="7"
+       prover="8"
        timelimit="3"
        memlimit="1000"
        obsolete="false"
@@ -774,113 +685,24 @@
      </goal>
      <goal
       name="WP_parameter negabeta.6"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="121" loccnumb="7" loccnume="15"
-      expl="parameter negabeta"
-      sum="d89cf513ec28f84639f2d030e304d8c3"
+      expl="postcondition"
+      sum="0c62fb57af952b3cf01548ae12f520fb"
       proved="false"
       expanded="true"
       shape="Calegal_movesV2aNiltaConsVViainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3ainfix =V7aminmaxV2V3iainfix &lt;=aminmaxV2V3V0ainfix &lt;=V7V0ainfix &gt;=V7V1Iiais_emptyV8ainfix =V7V6iainfix &lt;V9V1Aainfix &lt;amaxV6V0V9ainfix =V7V9iainfix &lt;=V9amaxV6V0ainfix &lt;=V7amaxV6V0ainfix &gt;=V7V1LaminaTuple2V2V3V8LaelementsV5FIainfix &gt;=V3c1Iainfix &gt;=V6V1NIiainfix &lt;V10aprefix -V0Aainfix &lt;aprefix -V1V10ainfix =V6aprefix -V10iainfix &lt;=V10aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FIainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
       <label
        name="expl:parameter negabeta"/>
-      <transf
-       name="split_goal_wp"
-       proved="false"
-       expanded="true">
-       <goal
-        name="WP_parameter negabeta.6.1"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="121" loccnumb="7" loccnume="15"
-        expl="parameter negabeta"
-        sum="551157802ffc47284d5ff6b3d0174acc"
-        proved="false"
-        expanded="true"
-        shape="Calegal_movesV2aNiltaConsVVainfix =V7aminmaxV2V3Iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3Iiais_emptyV8ainfix =V7V6iainfix &lt;V9V1Aainfix &lt;amaxV6V0V9ainfix =V7V9iainfix &lt;=V9amaxV6V0ainfix &lt;=V7amaxV6V0ainfix &gt;=V7V1LaminaTuple2V2V3V8LaelementsV5FIainfix &gt;=V3c1Iainfix &gt;=V6V1NIiainfix &lt;V10aprefix -V0Aainfix &lt;aprefix -V1V10ainfix =V6aprefix -V10iainfix &lt;=V10aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FIainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
-        <label
-         name="expl:parameter negabeta"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.02"/>
-        </proof>
-        <proof
-         prover="7"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.02"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter negabeta.6.2"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="121" loccnumb="7" loccnume="15"
-        expl="parameter negabeta"
-        sum="7efadff22a5f08d5a6565eefd09be332"
-        proved="false"
-        expanded="true"
-        shape="Calegal_movesV2aNiltaConsVVainfix &lt;=V7V0Iainfix &lt;=aminmaxV2V3V0Iainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3NIiais_emptyV8ainfix =V7V6iainfix &lt;V9V1Aainfix &lt;amaxV6V0V9ainfix =V7V9iainfix &lt;=V9amaxV6V0ainfix &lt;=V7amaxV6V0ainfix &gt;=V7V1LaminaTuple2V2V3V8LaelementsV5FIainfix &gt;=V3c1Iainfix &gt;=V6V1NIiainfix &lt;V10aprefix -V0Aainfix &lt;aprefix -V1V10ainfix =V6aprefix -V10iainfix &lt;=V10aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FIainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
-        <label
-         name="expl:parameter negabeta"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.02"/>
-        </proof>
-        <proof
-         prover="7"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.04"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter negabeta.6.3"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="121" loccnumb="7" loccnume="15"
-        expl="parameter negabeta"
-        sum="bf9429d4c8534169afe5f10e9f7d4b97"
-        proved="false"
-        expanded="true"
-        shape="Calegal_movesV2aNiltaConsVVainfix &gt;=V7V1Iainfix &lt;=aminmaxV2V3V0NIainfix &lt;aminmaxV2V3V1Aainfix &lt;V0aminmaxV2V3NIiais_emptyV8ainfix =V7V6iainfix &lt;V9V1Aainfix &lt;amaxV6V0V9ainfix =V7V9iainfix &lt;=V9amaxV6V0ainfix &lt;=V7amaxV6V0ainfix &gt;=V7V1LaminaTuple2V2V3V8LaelementsV5FIainfix &gt;=V3c1Iainfix &gt;=V6V1NIiainfix &lt;V10aprefix -V0Aainfix &lt;aprefix -V1V10ainfix =V6aprefix -V10iainfix &lt;=V10aprefix -V1ainfix &gt;=V6V1ainfix &lt;=V6V0Laminmaxado_moveV2V4ainfix -V3c1FIainfix &gt;=V3c1Iainfix =V3c0NIainfix &gt;=V3c0F">
-        <label
-         name="expl:parameter negabeta"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.03"/>
-        </proof>
-        <proof
-         prover="7"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.03"/>
-        </proof>
-       </goal>
-      </transf>
      </goal>
     </transf>
    </goal>
    <goal
     name="WP_parameter negabeta_rec"
-    locfile="alphaBeta/../alphaBeta.mlw"
+    locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
     loclnum="139" loccnumb="7" loccnume="19"
     expl="parameter negabeta_rec"
-    sum="5bf7bf43effd138b1648f5129d85c73c"
+    sum="c66a01f6b299603d0259e9d1c2fbfdfa"
     proved="false"
     expanded="true"
     shape="CV5aNiliainfix &lt;V7V1Aainfix &lt;V0V7ainfix =V4V7iainfix &lt;=V7V0ainfix &lt;=V4V0ainfix &gt;=V4V1LaminaTuple2V2V3V6Iais_emptyV6NLaelementsV5aConsVViainfix &gt;=amaxV10V4V1iais_emptyV11ainfix =amaxV10V4V4iainfix &lt;V12V1Aainfix &lt;V0V12ainfix =amaxV10V4V12iainfix &lt;=V12V0ainfix &lt;=amaxV10V4V0ainfix &gt;=amaxV10V4V1LaminaTuple2V2V3V11LaelementsV5iais_emptyV14ainfix =V13V4iainfix &lt;V15V1Aainfix &lt;V0V15ainfix =V13V15iainfix &lt;=V15V0ainfix &lt;=V13V0ainfix &gt;=V13V1LaminaTuple2V2V3V14LaelementsV5Iiais_emptyV16ainfix =V13amaxV10V4iainfix &lt;V17V1Aainfix &lt;amaxamaxV10V4V0V17ainfix =V13V17iainfix &lt;=V17amaxamaxV10V4V0ainfix &lt;=V13amaxamaxV10V4V0ainfix &gt;=V13V1LaminaTuple2V2V3V16LaelementsV9FAainfix &gt;=V3c1Iiainfix &lt;V18aprefix -V0Aainfix &lt;aprefix -V1V18ainfix =V10aprefix -V18iainfix &lt;=V18aprefix -V1ainfix &gt;=V10V1ainfix &lt;=V10V0Laminmaxado_moveV2V8ainfix -V3c1FAainfix &gt;=V3c1Iainfix &gt;=V3c1F">
@@ -892,12 +714,12 @@
      expanded="true">
      <goal
       name="WP_parameter negabeta_rec.1"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="139" loccnumb="7" loccnume="19"
-      expl="parameter negabeta_rec"
-      sum="9ff7c56f2e6e29490d579a495fa84a50"
+      expl="postcondition"
+      sum="a72723d0bf2dfef176587784dd8affcc"
       proved="true"
-      expanded="true"
+      expanded="false"
       shape="CV5aNiliainfix &lt;V7V1Aainfix &lt;V0V7ainfix =V4V7iainfix &lt;=V7V0ainfix &lt;=V4V0ainfix &gt;=V4V1LaminaTuple2V2V3V6Iais_emptyV6NLaelementsV5aConsVVtIainfix &gt;=V3c1F">
       <label
        name="expl:parameter negabeta_rec"/>
@@ -912,12 +734,12 @@
      </goal>
      <goal
       name="WP_parameter negabeta_rec.2"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="139" loccnumb="7" loccnume="19"
-      expl="parameter negabeta_rec"
-      sum="7a743d6260b730614d8bc15ca1520e27"
+      expl="precondition"
+      sum="9cd99ff522ee31d63052332211a779ea"
       proved="true"
-      expanded="true"
+      expanded="false"
       shape="CV5aNiltaConsVVainfix &gt;=V3c1Iainfix &gt;=V3c1F">
       <label
        name="expl:parameter negabeta_rec"/>
@@ -932,93 +754,24 @@
      </goal>
      <goal
       name="WP_parameter negabeta_rec.3"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="139" loccnumb="7" loccnume="19"
-      expl="parameter negabeta_rec"
-      sum="4fb41451abaf7fe10f1b7be184ba72b0"
+      expl="postcondition"
+      sum="10b8f31325e9daa35b3d3e2b5cbf8a28"
       proved="false"
       expanded="true"
       shape="CV5aNiltaConsVViais_emptyV9ainfix =amaxV8V4V4iainfix &lt;V10V1Aainfix &lt;V0V10ainfix =amaxV8V4V10iainfix &lt;=V10V0ainfix &lt;=amaxV8V4V0ainfix &gt;=amaxV8V4V1LaminaTuple2V2V3V9LaelementsV5Iainfix &gt;=amaxV8V4V1Iiainfix &lt;V11aprefix -V0Aainfix &lt;aprefix -V1V11ainfix =V8aprefix -V11iainfix &lt;=V11aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
       <label
        name="expl:parameter negabeta_rec"/>
-      <transf
-       name="split_goal_wp"
-       proved="false"
-       expanded="true">
-       <goal
-        name="WP_parameter negabeta_rec.3.1"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="139" loccnumb="7" loccnume="19"
-        expl="parameter negabeta_rec"
-        sum="2dcdeb438650fe0036af0f702cecccba"
-        proved="false"
-        expanded="true"
-        shape="CV5aNiltaConsVVainfix =amaxV8V4V4Iais_emptyV9LaelementsV5Iainfix &gt;=amaxV8V4V1Iiainfix &lt;V10aprefix -V0Aainfix &lt;aprefix -V1V10ainfix =V8aprefix -V10iainfix &lt;=V10aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
-        <label
-         name="expl:parameter negabeta_rec"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.02"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter negabeta_rec.3.2"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="139" loccnumb="7" loccnume="19"
-        expl="parameter negabeta_rec"
-        sum="3776add4686adb7c947b5c70477f6019"
-        proved="false"
-        expanded="true"
-        shape="CV5aNiltaConsVVainfix =amaxV8V4V10Iainfix &lt;V10V1Aainfix &lt;V0V10LaminaTuple2V2V3V9Iais_emptyV9NLaelementsV5Iainfix &gt;=amaxV8V4V1Iiainfix &lt;V11aprefix -V0Aainfix &lt;aprefix -V1V11ainfix =V8aprefix -V11iainfix &lt;=V11aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
-        <label
-         name="expl:parameter negabeta_rec"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.04"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter negabeta_rec.3.3"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="139" loccnumb="7" loccnume="19"
-        expl="parameter negabeta_rec"
-        sum="7e6ddc38fdfeda3a26a2fb427b37f939"
-        proved="false"
-        expanded="false"
-        shape="CV5aNiltaConsVVainfix &lt;=amaxV8V4V0Iainfix &lt;=V10V0Iainfix &lt;V10V1Aainfix &lt;V0V10NLaminaTuple2V2V3V9Iais_emptyV9NLaelementsV5Iainfix &gt;=amaxV8V4V1Iiainfix &lt;V11aprefix -V0Aainfix &lt;aprefix -V1V11ainfix =V8aprefix -V11iainfix &lt;=V11aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
-        <label
-         name="expl:parameter negabeta_rec"/>
-       </goal>
-       <goal
-        name="WP_parameter negabeta_rec.3.4"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="139" loccnumb="7" loccnume="19"
-        expl="parameter negabeta_rec"
-        sum="039899b6780b8b77c91cf6c2d440ccad"
-        proved="false"
-        expanded="false"
-        shape="CV5aNiltaConsVVainfix &gt;=amaxV8V4V1Iainfix &lt;=V10V0NIainfix &lt;V10V1Aainfix &lt;V0V10NLaminaTuple2V2V3V9Iais_emptyV9NLaelementsV5Iainfix &gt;=amaxV8V4V1Iiainfix &lt;V11aprefix -V0Aainfix &lt;aprefix -V1V11ainfix =V8aprefix -V11iainfix &lt;=V11aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
-        <label
-         name="expl:parameter negabeta_rec"/>
-       </goal>
-      </transf>
      </goal>
      <goal
       name="WP_parameter negabeta_rec.4"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="139" loccnumb="7" loccnume="19"
-      expl="parameter negabeta_rec"
-      sum="60216b66f8fcb5fef0d69edc2e2307c4"
+      expl="precondition"
+      sum="4329f1e96a2efe475056016c3f6199fa"
       proved="true"
-      expanded="true"
+      expanded="false"
       shape="CV5aNiltaConsVVainfix &gt;=V3c1Iainfix &gt;=amaxV8V4V1NIiainfix &lt;V9aprefix -V0Aainfix &lt;aprefix -V1V9ainfix =V8aprefix -V9iainfix &lt;=V9aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
       <label
        name="expl:parameter negabeta_rec"/>
@@ -1033,95 +786,26 @@
      </goal>
      <goal
       name="WP_parameter negabeta_rec.5"
-      locfile="alphaBeta/../alphaBeta.mlw"
+      locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
       loclnum="139" loccnumb="7" loccnume="19"
-      expl="parameter negabeta_rec"
-      sum="c174d4435b8d9257ca55b3251b01a508"
+      expl="postcondition"
+      sum="f3ca8402c3c7812cc64e0c47a83dcb95"
       proved="false"
       expanded="true"
       shape="CV5aNiltaConsVViais_emptyV10ainfix =V9V4iainfix &lt;V11V1Aainfix &lt;V0V11ainfix =V9V11iainfix &lt;=V11V0ainfix &lt;=V9V0ainfix &gt;=V9V1LaminaTuple2V2V3V10LaelementsV5Iiais_emptyV12ainfix =V9amaxV8V4iainfix &lt;V13V1Aainfix &lt;amaxamaxV8V4V0V13ainfix =V9V13iainfix &lt;=V13amaxamaxV8V4V0ainfix &lt;=V9amaxamaxV8V4V0ainfix &gt;=V9V1LaminaTuple2V2V3V12LaelementsV7FIainfix &gt;=V3c1Iainfix &gt;=amaxV8V4V1NIiainfix &lt;V14aprefix -V0Aainfix &lt;aprefix -V1V14ainfix =V8aprefix -V14iainfix &lt;=V14aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
       <label
        name="expl:parameter negabeta_rec"/>
-      <transf
-       name="split_goal_wp"
-       proved="false"
-       expanded="true">
-       <goal
-        name="WP_parameter negabeta_rec.5.1"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="139" loccnumb="7" loccnume="19"
-        expl="parameter negabeta_rec"
-        sum="90ec6b241f50ff259b866677bbb1c5e2"
-        proved="false"
-        expanded="true"
-        shape="CV5aNiltaConsVVainfix =V9V4Iais_emptyV10LaelementsV5Iiais_emptyV11ainfix =V9amaxV8V4iainfix &lt;V12V1Aainfix &lt;amaxamaxV8V4V0V12ainfix =V9V12iainfix &lt;=V12amaxamaxV8V4V0ainfix &lt;=V9amaxamaxV8V4V0ainfix &gt;=V9V1LaminaTuple2V2V3V11LaelementsV7FIainfix &gt;=V3c1Iainfix &gt;=amaxV8V4V1NIiainfix &lt;V13aprefix -V0Aainfix &lt;aprefix -V1V13ainfix =V8aprefix -V13iainfix &lt;=V13aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
-        <label
-         name="expl:parameter negabeta_rec"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.01"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter negabeta_rec.5.2"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="139" loccnumb="7" loccnume="19"
-        expl="parameter negabeta_rec"
-        sum="b6a64bab15f13d8dbaa447dfb085db20"
-        proved="false"
-        expanded="true"
-        shape="CV5aNiltaConsVVainfix =V9V11Iainfix &lt;V11V1Aainfix &lt;V0V11LaminaTuple2V2V3V10Iais_emptyV10NLaelementsV5Iiais_emptyV12ainfix =V9amaxV8V4iainfix &lt;V13V1Aainfix &lt;amaxamaxV8V4V0V13ainfix =V9V13iainfix &lt;=V13amaxamaxV8V4V0ainfix &lt;=V9amaxamaxV8V4V0ainfix &gt;=V9V1LaminaTuple2V2V3V12LaelementsV7FIainfix &gt;=V3c1Iainfix &gt;=amaxV8V4V1NIiainfix &lt;V14aprefix -V0Aainfix &lt;aprefix -V1V14ainfix =V8aprefix -V14iainfix &lt;=V14aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
-        <label
-         name="expl:parameter negabeta_rec"/>
-        <proof
-         prover="8"
-         timelimit="3"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="timeout" time="3.02"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter negabeta_rec.5.3"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="139" loccnumb="7" loccnume="19"
-        expl="parameter negabeta_rec"
-        sum="111af7509189844b8e54bb6500bb3ae3"
-        proved="false"
-        expanded="false"
-        shape="CV5aNiltaConsVVainfix &lt;=V9V0Iainfix &lt;=V11V0Iainfix &lt;V11V1Aainfix &lt;V0V11NLaminaTuple2V2V3V10Iais_emptyV10NLaelementsV5Iiais_emptyV12ainfix =V9amaxV8V4iainfix &lt;V13V1Aainfix &lt;amaxamaxV8V4V0V13ainfix =V9V13iainfix &lt;=V13amaxamaxV8V4V0ainfix &lt;=V9amaxamaxV8V4V0ainfix &gt;=V9V1LaminaTuple2V2V3V12LaelementsV7FIainfix &gt;=V3c1Iainfix &gt;=amaxV8V4V1NIiainfix &lt;V14aprefix -V0Aainfix &lt;aprefix -V1V14ainfix =V8aprefix -V14iainfix &lt;=V14aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
-        <label
-         name="expl:parameter negabeta_rec"/>
-       </goal>
-       <goal
-        name="WP_parameter negabeta_rec.5.4"
-        locfile="alphaBeta/../alphaBeta.mlw"
-        loclnum="139" loccnumb="7" loccnume="19"
-        expl="parameter negabeta_rec"
-        sum="f3dfaf5830b931c0ddabd82484884e16"
-        proved="false"
-        expanded="false"
-        shape="CV5aNiltaConsVVainfix &gt;=V9V1Iainfix &lt;=V11V0NIainfix &lt;V11V1Aainfix &lt;V0V11NLaminaTuple2V2V3V10Iais_emptyV10NLaelementsV5Iiais_emptyV12ainfix =V9amaxV8V4iainfix &lt;V13V1Aainfix &lt;amaxamaxV8V4V0V13ainfix =V9V13iainfix &lt;=V13amaxamaxV8V4V0ainfix &lt;=V9amaxamaxV8V4V0ainfix &gt;=V9V1LaminaTuple2V2V3V12LaelementsV7FIainfix &gt;=V3c1Iainfix &gt;=amaxV8V4V1NIiainfix &lt;V14aprefix -V0Aainfix &lt;aprefix -V1V14ainfix =V8aprefix -V14iainfix &lt;=V14aprefix -V1ainfix &gt;=V8V1ainfix &lt;=V8V0Laminmaxado_moveV2V6ainfix -V3c1FIainfix &gt;=V3c1Iainfix &gt;=V3c1F">
-        <label
-         name="expl:parameter negabeta_rec"/>
-       </goal>
-      </transf>
      </goal>
     </transf>
    </goal>
    <goal
     name="WP_parameter alpha_beta"
-    locfile="alphaBeta/../alphaBeta.mlw"
+    locfile="examples/programs/alphaBeta/../alphaBeta.mlw"
     loclnum="161" loccnumb="4" loccnume="14"
     expl="parameter alpha_beta"
-    sum="334640492f5a16adbb8a7a757e382f07"
+    sum="0aea44b26fbd3a7027d1d89dd329af75"
     proved="true"
-    expanded="true"
+    expanded="false"
     shape="ainfix =V2aminmaxV0V1Iiainfix &lt;aminmaxV0V1ainfinityAainfix &lt;aprefix -ainfinityaminmaxV0V1ainfix =V2aminmaxV0V1iainfix &lt;=aminmaxV0V1aprefix -ainfinityainfix &lt;=V2aprefix -ainfinityainfix &gt;=V2ainfinityFAainfix &gt;=V1c0Iainfix &gt;=V1c0F">
     <label
      name="expl:parameter alpha_beta"/>
diff --git a/examples/programs/bellman_ford/why3session.xml b/examples/programs/bellman_ford/why3session.xml
index b002025bd39cb364d0c03e7f2d18d8b7d044f644..0d713e29af396e72499f49944b8faf5255e9eedf 100644
--- a/examples/programs/bellman_ford/why3session.xml
+++ b/examples/programs/bellman_ford/why3session.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
- name="examples/programs/bellman_ford/why3session.xml" shape_version="2">
+ name="programs/bellman_ford/why3session.xml" shape_version="2">
  <prover
   id="0"
   name="Alt-Ergo"
@@ -24,15 +24,15 @@
   expanded="true">
   <theory
    name="Graph"
-   locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+   locfile="programs/bellman_ford/../bellman_ford.mlw"
    loclnum="7" loccnumb="7" loccnume="12"
    verified="true"
    expanded="true">
    <goal
     name="vertices_cardinal_pos"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="30" loccnumb="8" loccnume="29"
-    sum="db43f37df5d05a6ae609d7c6068de11d"
+    sum="828db20cb095b478ef82276899885d2e"
     proved="true"
     expanded="true"
     shape="ainfix &gt;acardinalaverticesc0">
@@ -47,9 +47,9 @@
    </goal>
    <goal
     name="path_in_vertices"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="36" loccnumb="8" loccnume="24"
-    sum="12c1fb1d3c97737552bcc8f184602a39"
+    sum="12e4355dbc33f48f275ec8d24456195a"
     proved="true"
     expanded="true"
     shape="amemV1averticesIapathV0V2V1IamemV0averticesF">
@@ -65,9 +65,9 @@
    </goal>
    <goal
     name="long_path_decomposition_pigeon1"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="60" loccnumb="8" loccnume="39"
-    sum="3edb2ab0e22060f43004f6452759b727"
+    sum="c9fa11d74958eb1150dd0d33dcd90741"
     proved="true"
     expanded="true"
     shape="amemV2averticesIamemV2aConsV1V0FIainfix =V0aNilNIapathasV0V1F">
@@ -78,14 +78,14 @@
      edited="bellman_ford_Graph_long_path_decomposition_pigeon1_1.v"
      obsolete="false"
      archived="false">
-     <result status="valid" time="1.32"/>
+     <result status="valid" time="0.97"/>
     </proof>
    </goal>
    <goal
     name="long_path_decomposition_pigeon2"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="65" loccnumb="8" loccnume="39"
-    sum="8612670dfa4c5f457fc2a2310ffec83b"
+    sum="02af2e3f582103bda39e0585c2000356"
     proved="true"
     expanded="true"
     shape="ainfix =aConsV1V0ainfix ++V3aConsV2ainfix ++V4aConsV2V5EIainfix &gt;alengthaConsV1V0acardinalaverticesIamemV6averticesIamemV6aConsV1V0FF">
@@ -100,9 +100,9 @@
    </goal>
    <goal
     name="long_path_decomposition_pigeon3"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="72" loccnumb="8" loccnume="39"
-    sum="c087abee97d651a72bc4b7ff8b78719f"
+    sum="ca80e69a695003e41351604fa779951f"
     proved="true"
     expanded="true"
     shape="ainfix =V0ainfix ++V3aConsV2ainfix ++V4aConsV2V5EOainfix =V0ainfix ++V6aConsV1V7EIainfix =aConsV1V0ainfix ++V9aConsV8ainfix ++V10aConsV8V11EF">
@@ -118,9 +118,9 @@
    </goal>
    <goal
     name="long_path_decomposition"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="80" loccnumb="8" loccnume="31"
-    sum="b4288a9d762c0655618d52d960edda9b"
+    sum="f041d39aa8770ccd68ad326067a78b66"
     proved="true"
     expanded="true"
     shape="ainfix =V0ainfix ++V3aConsV2ainfix ++V4aConsV2V5EOainfix =V0ainfix ++V6aConsV1V7EIainfix &gt;=alengthV0acardinalaverticesIapathasV0V1F">
@@ -136,9 +136,9 @@
    </goal>
    <goal
     name="simple_path"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="87" loccnumb="8" loccnume="19"
-    sum="0afec8d07a229181e66ab00359aedc8c"
+    sum="aedea4401d804fd98292bf461f439334"
     proved="true"
     expanded="true"
     shape="ainfix &lt;alengthV2acardinalaverticesAapathasV2V0EIapathasV1V0F">
@@ -154,9 +154,9 @@
    </goal>
    <goal
     name="key_lemma_1"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="108" loccnumb="8" loccnume="19"
-    sum="289818214cd3187dfac6a5450e21a92d"
+    sum="479b45a99bb6b5a4c24124b10fe7688f"
     proved="true"
     expanded="true"
     shape="anegative_cycleV2EIainfix &lt;apath_weightV3V0V1AapathasV3V0EIainfix &gt;=apath_weightV4V0V1Iainfix &lt;alengthV4acardinalaverticesIapathasV4V0FF">
@@ -173,15 +173,15 @@
   </theory>
   <theory
    name="BellmanFord"
-   locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+   locfile="programs/bellman_ford/../bellman_ford.mlw"
    loclnum="120" loccnumb="7" loccnume="18"
    verified="true"
    expanded="true">
    <goal
     name="key_lemma_2"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="172" loccnumb="8" loccnume="19"
-    sum="18ace61e702a241b52207ae412a37346"
+    sum="3c4578e63bfb641efd062080d01530c0"
     proved="true"
     expanded="true"
     shape="anegative_cycleV1NFIainv2V0aedgesIainv1V0acardinalaverticesaemptyF">
@@ -192,15 +192,15 @@
      edited="bf_WP_BellmanFord_key_lemma_2_1.v"
      obsolete="false"
      archived="false">
-     <result status="valid" time="21.18"/>
+     <result status="valid" time="17.33"/>
     </proof>
    </goal>
    <goal
     name="WP_parameter relax"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="176" loccnumb="6" loccnume="11"
     expl="parameter relax"
-    sum="be6a123356b66119ab61e6bc12723911"
+    sum="0fc083f62349b54f74b62c844edcfadb"
     proved="true"
     expanded="true"
     shape="iCagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V5aweightV0V1V6ainv1V7V2aaddaTuple2V0V1V3Iainfix =V7asetV4V1CagetV4V0aInfiniteaInfiniteaFiniteVaFiniteainfix +V8aweightV0V1Fainv1V4V2aaddaTuple2V0V1V3Iainv1V4V2V3AamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix &lt;=c1V2FF">
@@ -212,10 +212,10 @@
      expanded="true">
      <goal
       name="WP_parameter relax.1"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="176" loccnumb="6" loccnume="11"
       expl="postcondition"
-      sum="41be2336f5574c85c3532db650de0f2b"
+      sum="09bf3a8aa6a5aa77d89b8803235750fe"
       proved="true"
       expanded="true"
       shape="ainv1V5V2aaddaTuple2V0V1V3Iainfix =V5asetV4V1CagetV4V0aInfiniteaInfiniteaFiniteVaFiniteainfix +V6aweightV0V1FICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V7aweightV0V1V8Iainv1V4V2V3AamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix &lt;=c1V2FF">
@@ -227,10 +227,10 @@
        expanded="true">
        <goal
         name="WP_parameter relax.1.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="176" loccnumb="6" loccnume="11"
         expl="postcondition"
-        sum="21e00c28ac76e7aeab141d9d4fde6444"
+        sum="42343ab5745054f9805702ce88f60072"
         proved="true"
         expanded="true"
         shape="Camixfix []V5V6aFiniteVainfix &gt;=ainfix +apath_weightV9V8aweightV8V6V7IamemaTuple2V8V6aaddaTuple2V0V1V3Iainfix &lt;alengthV9V2IapathasV9V8FAainfix &gt;=apath_weightV10V6V7Iainfix &lt;alengthV10V2IapathasV10V6FAainfix =apath_weightV11V6V7AapathasV11V6EaInfiniteainfix &gt;=alengthV13V2IapathasV13V12FIamemaTuple2V12V6aaddaTuple2V0V1V3FAainfix &gt;=alengthV14V2IapathasV14V6FIamemV6averticesFIainfix =V5asetV4V1CagetV4V0aInfiniteaInfiniteaFiniteVaFiniteainfix +V15aweightV0V1FICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V16aweightV0V1V17ICamixfix []V4V18aFiniteVainfix &gt;=ainfix +apath_weightV21V20aweightV20V18V19IamemaTuple2V20V18V3Iainfix &lt;alengthV21V2IapathasV21V20FAainfix &gt;=apath_weightV22V18V19Iainfix &lt;alengthV22V2IapathasV22V18FAainfix =apath_weightV23V18V19AapathasV23V18EaInfiniteainfix &gt;=alengthV25V2IapathasV25V24FIamemaTuple2V24V18V3FAainfix &gt;=alengthV26V2IapathasV26V18FIamemV18averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -242,10 +242,10 @@
          expanded="true">
          <goal
           name="WP_parameter relax.1.1.1"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="0f69e692283a18448423df01b6bc47b6"
+          sum="c63c5c71f8e97fc3c2be76f865b97aa9"
           proved="true"
           expanded="true"
           shape="Camixfix []V5V6aFiniteVainfix =apath_weightV8V6V7AapathasV8V6EaInfinitetIamemV6averticesFIainfix =V5asetV4V1CagetV4V0aInfiniteaInfiniteaFiniteVaFiniteainfix +V9aweightV0V1FICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V10aweightV0V1V11ICamixfix []V4V12aFiniteVainfix &gt;=ainfix +apath_weightV15V14aweightV14V12V13IamemaTuple2V14V12V3Iainfix &lt;alengthV15V2IapathasV15V14FAainfix &gt;=apath_weightV16V12V13Iainfix &lt;alengthV16V2IapathasV16V12FAainfix =apath_weightV17V12V13AapathasV17V12EaInfiniteainfix &gt;=alengthV19V2IapathasV19V18FIamemaTuple2V18V12V3FAainfix &gt;=alengthV20V2IapathasV20V12FIamemV12averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -263,10 +263,10 @@
          </goal>
          <goal
           name="WP_parameter relax.1.1.2"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="2a4b27ec16f341b3678adf7a66fc297d"
+          sum="5334960db6afa2cc64d55165689d28a1"
           proved="true"
           expanded="true"
           shape="Camixfix []V5V6aFiniteVainfix &gt;=apath_weightV8V6V7Iainfix &lt;alengthV8V2IapathasV8V6FaInfinitetIamemV6averticesFIainfix =V5asetV4V1CagetV4V0aInfiniteaInfiniteaFiniteVaFiniteainfix +V9aweightV0V1FICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V10aweightV0V1V11ICamixfix []V4V12aFiniteVainfix &gt;=ainfix +apath_weightV15V14aweightV14V12V13IamemaTuple2V14V12V3Iainfix &lt;alengthV15V2IapathasV15V14FAainfix &gt;=apath_weightV16V12V13Iainfix &lt;alengthV16V2IapathasV16V12FAainfix =apath_weightV17V12V13AapathasV17V12EaInfiniteainfix &gt;=alengthV19V2IapathasV19V18FIamemaTuple2V18V12V3FAainfix &gt;=alengthV20V2IapathasV20V12FIamemV12averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -286,15 +286,15 @@
            memlimit="0"
            obsolete="false"
            archived="false">
-           <result status="valid" time="1.12"/>
+           <result status="valid" time="0.81"/>
           </proof>
          </goal>
          <goal
           name="WP_parameter relax.1.1.3"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="5e6c8219dc633a507f8e13ef35b4a9ab"
+          sum="c7be9625552de34ef5f378ed163a3b01"
           proved="true"
           expanded="true"
           shape="Camixfix []V5V6aFiniteVainfix &gt;=ainfix +apath_weightV9V8aweightV8V6V7IamemaTuple2V8V6aaddaTuple2V0V1V3Iainfix &lt;alengthV9V2IapathasV9V8FaInfinitetIamemV6averticesFIainfix =V5asetV4V1CagetV4V0aInfiniteaInfiniteaFiniteVaFiniteainfix +V10aweightV0V1FICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V11aweightV0V1V12ICamixfix []V4V13aFiniteVainfix &gt;=ainfix +apath_weightV16V15aweightV15V13V14IamemaTuple2V15V13V3Iainfix &lt;alengthV16V2IapathasV16V15FAainfix &gt;=apath_weightV17V13V14Iainfix &lt;alengthV17V2IapathasV17V13FAainfix =apath_weightV18V13V14AapathasV18V13EaInfiniteainfix &gt;=alengthV20V2IapathasV20V19FIamemaTuple2V19V13V3FAainfix &gt;=alengthV21V2IapathasV21V13FIamemV13averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -311,10 +311,10 @@
          </goal>
          <goal
           name="WP_parameter relax.1.1.4"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="b66a8805f816b5f99b8a00823b9f8903"
+          sum="c33e860794a38a618d7017177e21b817"
           proved="true"
           expanded="true"
           shape="Camixfix []V5V6aFiniteVtaInfiniteainfix &gt;=alengthV8V2IapathasV8V6FIamemV6averticesFIainfix =V5asetV4V1CagetV4V0aInfiniteaInfiniteaFiniteVaFiniteainfix +V9aweightV0V1FICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V10aweightV0V1V11ICamixfix []V4V12aFiniteVainfix &gt;=ainfix +apath_weightV15V14aweightV14V12V13IamemaTuple2V14V12V3Iainfix &lt;alengthV15V2IapathasV15V14FAainfix &gt;=apath_weightV16V12V13Iainfix &lt;alengthV16V2IapathasV16V12FAainfix =apath_weightV17V12V13AapathasV17V12EaInfiniteainfix &gt;=alengthV19V2IapathasV19V18FIamemaTuple2V18V12V3FAainfix &gt;=alengthV20V2IapathasV20V12FIamemV12averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -326,7 +326,7 @@
            memlimit="0"
            obsolete="false"
            archived="false">
-           <result status="valid" time="6.89"/>
+           <result status="valid" time="5.12"/>
           </proof>
           <proof
            prover="1"
@@ -342,15 +342,15 @@
            memlimit="0"
            obsolete="false"
            archived="false">
-           <result status="valid" time="0.85"/>
+           <result status="valid" time="0.25"/>
           </proof>
          </goal>
          <goal
           name="WP_parameter relax.1.1.5"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="7ace30d2507f4097b50af8741284dfa4"
+          sum="d77ef4d0ec8d5855020d7625e82ca475"
           proved="true"
           expanded="true"
           shape="Camixfix []V5V6aFiniteVtaInfiniteainfix &gt;=alengthV9V2IapathasV9V8FIamemaTuple2V8V6aaddaTuple2V0V1V3FIamemV6averticesFIainfix =V5asetV4V1CagetV4V0aInfiniteaInfiniteaFiniteVaFiniteainfix +V10aweightV0V1FICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V11aweightV0V1V12ICamixfix []V4V13aFiniteVainfix &gt;=ainfix +apath_weightV16V15aweightV15V13V14IamemaTuple2V15V13V3Iainfix &lt;alengthV16V2IapathasV16V15FAainfix &gt;=apath_weightV17V13V14Iainfix &lt;alengthV17V2IapathasV17V13FAainfix =apath_weightV18V13V14AapathasV18V13EaInfiniteainfix &gt;=alengthV20V2IapathasV20V19FIamemaTuple2V19V13V3FAainfix &gt;=alengthV21V2IapathasV21V13FIamemV13averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -362,7 +362,7 @@
            memlimit="0"
            obsolete="false"
            archived="false">
-           <result status="valid" time="0.75"/>
+           <result status="valid" time="0.53"/>
           </proof>
          </goal>
         </transf>
@@ -371,10 +371,10 @@
      </goal>
      <goal
       name="WP_parameter relax.2"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="176" loccnumb="6" loccnume="11"
       expl="postcondition"
-      sum="7f1b47c4e83c7ad7a6e975c6ffe94ea0"
+      sum="2c97b69312e917f1edb5e21be85c2c24"
       proved="true"
       expanded="true"
       shape="ainv1V4V2aaddaTuple2V0V1V3ICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V5aweightV0V1V6NIainv1V4V2V3AamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix &lt;=c1V2FF">
@@ -386,10 +386,10 @@
        expanded="true">
        <goal
         name="WP_parameter relax.2.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="176" loccnumb="6" loccnume="11"
         expl="postcondition"
-        sum="1e4cdb1b5558b5c1138c9e279b881924"
+        sum="4ba179bce8e43b2db6ecdd44597a05c4"
         proved="true"
         expanded="true"
         shape="Camixfix []V4V5aFiniteVainfix &gt;=ainfix +apath_weightV8V7aweightV7V5V6IamemaTuple2V7V5aaddaTuple2V0V1V3Iainfix &lt;alengthV8V2IapathasV8V7FAainfix &gt;=apath_weightV9V5V6Iainfix &lt;alengthV9V2IapathasV9V5FAainfix =apath_weightV10V5V6AapathasV10V5EaInfiniteainfix &gt;=alengthV12V2IapathasV12V11FIamemaTuple2V11V5aaddaTuple2V0V1V3FAainfix &gt;=alengthV13V2IapathasV13V5FIamemV5averticesFICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V14aweightV0V1V15NICamixfix []V4V16aFiniteVainfix &gt;=ainfix +apath_weightV19V18aweightV18V16V17IamemaTuple2V18V16V3Iainfix &lt;alengthV19V2IapathasV19V18FAainfix &gt;=apath_weightV20V16V17Iainfix &lt;alengthV20V2IapathasV20V16FAainfix =apath_weightV21V16V17AapathasV21V16EaInfiniteainfix &gt;=alengthV23V2IapathasV23V22FIamemaTuple2V22V16V3FAainfix &gt;=alengthV24V2IapathasV24V16FIamemV16averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -401,10 +401,10 @@
          expanded="true">
          <goal
           name="WP_parameter relax.2.1.1"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="fa4245d89ae475b44dba18154cff6dfa"
+          sum="3496ba28e52597baee50bd071d46b7dc"
           proved="true"
           expanded="true"
           shape="Camixfix []V4V5aFiniteVainfix =apath_weightV7V5V6AapathasV7V5EaInfinitetIamemV5averticesFICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V8aweightV0V1V9NICamixfix []V4V10aFiniteVainfix &gt;=ainfix +apath_weightV13V12aweightV12V10V11IamemaTuple2V12V10V3Iainfix &lt;alengthV13V2IapathasV13V12FAainfix &gt;=apath_weightV14V10V11Iainfix &lt;alengthV14V2IapathasV14V10FAainfix =apath_weightV15V10V11AapathasV15V10EaInfiniteainfix &gt;=alengthV17V2IapathasV17V16FIamemaTuple2V16V10V3FAainfix &gt;=alengthV18V2IapathasV18V10FIamemV10averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -437,10 +437,10 @@
          </goal>
          <goal
           name="WP_parameter relax.2.1.2"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="cef21940b1429cda4dc2b6774e7fc49c"
+          sum="4ca2a43dfb6cf64b01cd1b921b5e7647"
           proved="true"
           expanded="true"
           shape="Camixfix []V4V5aFiniteVainfix &gt;=apath_weightV7V5V6Iainfix &lt;alengthV7V2IapathasV7V5FaInfinitetIamemV5averticesFICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V8aweightV0V1V9NICamixfix []V4V10aFiniteVainfix &gt;=ainfix +apath_weightV13V12aweightV12V10V11IamemaTuple2V12V10V3Iainfix &lt;alengthV13V2IapathasV13V12FAainfix &gt;=apath_weightV14V10V11Iainfix &lt;alengthV14V2IapathasV14V10FAainfix =apath_weightV15V10V11AapathasV15V10EaInfiniteainfix &gt;=alengthV17V2IapathasV17V16FIamemaTuple2V16V10V3FAainfix &gt;=alengthV18V2IapathasV18V10FIamemV10averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -452,7 +452,7 @@
            memlimit="0"
            obsolete="false"
            archived="false">
-           <result status="valid" time="3.07"/>
+           <result status="valid" time="2.28"/>
           </proof>
           <proof
            prover="1"
@@ -473,10 +473,10 @@
          </goal>
          <goal
           name="WP_parameter relax.2.1.3"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="1ad66e833337e3e7d6eba84fef97d617"
+          sum="84f5d4f512022e9b8f403014e537055e"
           proved="true"
           expanded="true"
           shape="Camixfix []V4V5aFiniteVainfix &gt;=ainfix +apath_weightV8V7aweightV7V5V6IamemaTuple2V7V5aaddaTuple2V0V1V3Iainfix &lt;alengthV8V2IapathasV8V7FaInfinitetIamemV5averticesFICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V9aweightV0V1V10NICamixfix []V4V11aFiniteVainfix &gt;=ainfix +apath_weightV14V13aweightV13V11V12IamemaTuple2V13V11V3Iainfix &lt;alengthV14V2IapathasV14V13FAainfix &gt;=apath_weightV15V11V12Iainfix &lt;alengthV15V2IapathasV15V11FAainfix =apath_weightV16V11V12AapathasV16V11EaInfiniteainfix &gt;=alengthV18V2IapathasV18V17FIamemaTuple2V17V11V3FAainfix &gt;=alengthV19V2IapathasV19V11FIamemV11averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -501,10 +501,10 @@
          </goal>
          <goal
           name="WP_parameter relax.2.1.4"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="058d544a605900dc72cfbfd6f79adf9c"
+          sum="2f6a536d9b01df73c21f0066e20e709c"
           proved="true"
           expanded="true"
           shape="Camixfix []V4V5aFiniteVtaInfiniteainfix &gt;=alengthV7V2IapathasV7V5FIamemV5averticesFICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V8aweightV0V1V9NICamixfix []V4V10aFiniteVainfix &gt;=ainfix +apath_weightV13V12aweightV12V10V11IamemaTuple2V12V10V3Iainfix &lt;alengthV13V2IapathasV13V12FAainfix &gt;=apath_weightV14V10V11Iainfix &lt;alengthV14V2IapathasV14V10FAainfix =apath_weightV15V10V11AapathasV15V10EaInfiniteainfix &gt;=alengthV17V2IapathasV17V16FIamemaTuple2V16V10V3FAainfix &gt;=alengthV18V2IapathasV18V10FIamemV10averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -516,7 +516,7 @@
            memlimit="0"
            obsolete="false"
            archived="false">
-           <result status="valid" time="4.51"/>
+           <result status="valid" time="3.41"/>
           </proof>
           <proof
            prover="1"
@@ -537,10 +537,10 @@
          </goal>
          <goal
           name="WP_parameter relax.2.1.5"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="176" loccnumb="6" loccnume="11"
           expl="postcondition"
-          sum="dc47029f01e46c0c5c54693221cbe0ef"
+          sum="c297bce95652a7c572656be2acc71501"
           proved="true"
           expanded="true"
           shape="Camixfix []V4V5aFiniteVtaInfiniteainfix &gt;=alengthV8V2IapathasV8V7FIamemaTuple2V7V5aaddaTuple2V0V1V3FIamemV5averticesFICagetV4V0aInfinitefaFiniteVCagetV4V1aInfinitetaFiniteVainfix &lt;ainfix +V9aweightV0V1V10NICamixfix []V4V11aFiniteVainfix &gt;=ainfix +apath_weightV14V13aweightV13V11V12IamemaTuple2V13V11V3Iainfix &lt;alengthV14V2IapathasV14V13FAainfix &gt;=apath_weightV15V11V12Iainfix &lt;alengthV15V2IapathasV15V11FAainfix =apath_weightV16V11V12AapathasV16V11EaInfiniteainfix &gt;=alengthV18V2IapathasV18V17FIamemaTuple2V17V11V3FAainfix &gt;=alengthV19V2IapathasV19V11FIamemV11averticesFAamemaTuple2V0V1V3NAamemaTuple2V0V1aedgesAainfix =c1V2Oainfix &lt;c1V2FF">
@@ -571,10 +571,10 @@
    </goal>
    <goal
     name="WP_parameter bellman_ford"
-    locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+    locfile="programs/bellman_ford/../bellman_ford.mlw"
     loclnum="186" loccnumb="6" loccnume="18"
     expl="parameter bellman_ford"
-    sum="206724dfbeec66a265fb81fdd6512567"
+    sum="539ace5b9de70d9682c6f533435036f7"
     proved="true"
     expanded="true"
     shape="iainfix =V3aTrueNiCagetV0V5aInfinitefaFiniteVCagetV0V6aInfinitetaFiniteVainfix &lt;ainfix +V8aweightV5V6V9anegative_cycleV10Eainfix &lt;acardinalV4acardinalV2Aainfix &lt;=c0acardinalV2Aainv2V0adiffaedgesV4AasubsetV4aedgesIainfix =V4aremoveV7V2AamemV7V2LaTuple2V5V6FFAais_emptyV2NCagetV0V11aFiniteVainfix &gt;=apath_weightV13V11V12IapathasV13V11FAainfix =apath_weightV14V11V12AapathasV14V11EaInfiniteapathasV15V11NFIamemV11averticesFAainv2V0aedgesIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFAainv2V0adiffaedgesV1AasubsetV1aedgesIainfix =V1aedgesFAainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyAiainfix =V20aTrueNainfix &lt;acardinalV21acardinalV18Aainfix &lt;=c0acardinalV18Aainv1V25V16adiffaedgesV21AasubsetV21aedgesIainv1V25V16aaddaTuple2V22V23adiffaedgesV18FAainv1V19V16adiffaedgesV18AamemaTuple2V22V23adiffaedgesV18NAamemaTuple2V22V23aedgesAainfix &lt;=c1V16Iainfix =V21aremoveV24V18AamemV24V18LaTuple2V22V23FFAais_emptyV18Nainv1V19ainfix +V16c1aemptyAainv1V19V16aedgesIais_emptyV18qainfix =V20aTrueFIainv1V19V16adiffaedgesV18AasubsetV18aedgesFAainv1V0V16adiffaedgesV17AasubsetV17aedgesIainfix =V17aedgesFIainv1V0V16aemptyIainfix &lt;=V16ainfix -acardinalaverticesc1Aainfix &lt;=c1V16FFAainv1ainitialize_single_sourceasc1aemptyIainfix &lt;=c1ainfix -acardinalaverticesc1Aiainfix =V28aTrueNiCagetainitialize_single_sourceasV30aInfinitefaFiniteVCagetainitialize_single_sourceasV31aInfinitetaFiniteVainfix &lt;ainfix +V33aweightV30V31V34anegative_cycleV35Eainfix &lt;acardinalV29acardinalV27Aainfix &lt;=c0acardinalV27Aainv2ainitialize_single_sourceasadiffaedgesV29AasubsetV29aedgesIainfix =V29aremoveV32V27AamemV32V27LaTuple2V30V31FFAais_emptyV27NCagetainitialize_single_sourceasV36aFiniteVainfix &gt;=apath_weightV38V36V37IapathasV38V36FAainfix =apath_weightV39V36V37AapathasV39V36EaInfiniteapathasV40V36NFIamemV36averticesFAainv2ainitialize_single_sourceasaedgesIais_emptyV27qainfix =V28aTrueFIainv2ainitialize_single_sourceasadiffaedgesV27AasubsetV27aedgesFAainv2ainitialize_single_sourceasadiffaedgesV26AasubsetV26aedgesIainfix =V26aedgesFAainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -586,10 +586,10 @@
      expanded="true">
      <goal
       name="WP_parameter bellman_ford.1"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="assertion"
-      sum="8b4401a193292be324d0dbf8a9e50442"
+      sum="66794bf4fe874e3f290d790f72019a52"
       proved="true"
       expanded="true"
       shape="ainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -606,10 +606,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.2"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop invariant init"
-      sum="6175d1ec70026cdd7a6c77d442ab5f3d"
+      sum="818aadd381e5736c6146f31bf007f4f0"
       proved="true"
       expanded="true"
       shape="ainv2ainitialize_single_sourceasadiffaedgesV0AasubsetV0aedgesIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -626,10 +626,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.3"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="precondition"
-      sum="ef1e9f9b117e7a270c0360594f659264"
+      sum="773291203b5d4be7688254c124f6e7d1"
       proved="true"
       expanded="true"
       shape="ais_emptyV1NIainfix =V2aTrueNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -646,10 +646,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.4"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="exceptional postcondition"
-      sum="51186535507486c6665f334f0598ff98"
+      sum="32e9bae2fe0d2901105c2bb2f38fba00"
       proved="true"
       expanded="true"
       shape="anegative_cycleV7EICagetainitialize_single_sourceasV4aInfinitefaFiniteVCagetainitialize_single_sourceasV5aInfinitetaFiniteVainfix &lt;ainfix +V8aweightV4V5V9Iainfix =V3aremoveV6V1AamemV6V1LaTuple2V4V5FFIais_emptyV1NIainfix =V2aTrueNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -667,10 +667,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.5"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop invariant preservation"
-      sum="91e19a84692d7be76ca91a537314908d"
+      sum="2ab6ffcf90f6eff235fbeaa3a6831941"
       proved="true"
       expanded="true"
       shape="ainv2ainitialize_single_sourceasadiffaedgesV3AasubsetV3aedgesICagetainitialize_single_sourceasV4aInfinitefaFiniteVCagetainitialize_single_sourceasV5aInfinitetaFiniteVainfix &lt;ainfix +V7aweightV4V5V8NIainfix =V3aremoveV6V1AamemV6V1LaTuple2V4V5FFIais_emptyV1NIainfix =V2aTrueNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -682,10 +682,10 @@
        expanded="true">
        <goal
         name="WP_parameter bellman_ford.5.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="parameter bellman_ford"
-        sum="0cd55616814591c847091f75ac8c70a2"
+        sum="84574dc35ea20100db3732d261b4415c"
         proved="true"
         expanded="true"
         shape="asubsetV3aedgesICagetainitialize_single_sourceasV4aInfinitefaFiniteVCagetainitialize_single_sourceasV5aInfinitetaFiniteVainfix &lt;ainfix +V7aweightV4V5V8NIainfix =V3aremoveV6V1AamemV6V1LaTuple2V4V5FFIais_emptyV1NIainfix =V2aTrueNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -702,10 +702,10 @@
        </goal>
        <goal
         name="WP_parameter bellman_ford.5.2"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="parameter bellman_ford"
-        sum="b0c6702ef6f4d7ef55cb3fb2d68057a8"
+        sum="365d449604c7b910f72849bfb07a1e6f"
         proved="true"
         expanded="true"
         shape="ainv2ainitialize_single_sourceasadiffaedgesV3ICagetainitialize_single_sourceasV4aInfinitefaFiniteVCagetainitialize_single_sourceasV5aInfinitetaFiniteVainfix &lt;ainfix +V7aweightV4V5V8NIainfix =V3aremoveV6V1AamemV6V1LaTuple2V4V5FFIais_emptyV1NIainfix =V2aTrueNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -717,17 +717,17 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="30.29"/>
+         <result status="valid" time="18.75"/>
         </proof>
        </goal>
       </transf>
      </goal>
      <goal
       name="WP_parameter bellman_ford.6"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop variant decrease"
-      sum="e4abd08ecf1c6260da65b6726e0e69f8"
+      sum="23053feed29dc9b935cb1c5d369009ec"
       proved="true"
       expanded="true"
       shape="ainfix &lt;acardinalV3acardinalV1Aainfix &lt;=c0acardinalV1ICagetainitialize_single_sourceasV4aInfinitefaFiniteVCagetainitialize_single_sourceasV5aInfinitetaFiniteVainfix &lt;ainfix +V7aweightV4V5V8NIainfix =V3aremoveV6V1AamemV6V1LaTuple2V4V5FFIais_emptyV1NIainfix =V2aTrueNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -744,10 +744,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.7"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="assertion"
-      sum="8555b974216fe0b08013e971ea754001"
+      sum="31df14710f8536c29717ee553eb409de"
       proved="true"
       expanded="true"
       shape="ainv2ainitialize_single_sourceasaedgesIainfix =V2aTrueNNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -759,10 +759,10 @@
        expanded="true">
        <goal
         name="WP_parameter bellman_ford.7.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="assertion"
-        sum="3b850dacedd2a4478f79b5c9105b3452"
+        sum="355b8a09fc230a18b7d5e0cd6dae4f3b"
         proved="true"
         expanded="true"
         shape="aleamixfix []ainitialize_single_sourceasV4aaddamixfix []ainitialize_single_sourceasV3aFiniteaweightV3V4IamemaTuple2V3V4aedgesFIainfix =V2aTrueNNIamemV5V1NFqainfix =V2aTrueFIaleamixfix []ainitialize_single_sourceasV7aaddamixfix []ainitialize_single_sourceasV6aFiniteaweightV6V7IamemaTuple2V6V7adiffaedgesV1FAamemV8aedgesIamemV8V1FFIainfix =V0aedgesFICamixfix []ainitialize_single_sourceasV9aFiniteVainfix &gt;=ainfix +apath_weightV12V11aweightV11V9V10IamemaTuple2V11V9aemptyIainfix &lt;alengthV12acardinalaverticesIapathasV12V11FAainfix &gt;=apath_weightV13V9V10Iainfix &lt;alengthV13acardinalaverticesIapathasV13V9FAainfix =apath_weightV14V9V10AapathasV14V9EaInfiniteainfix &gt;=alengthV16acardinalaverticesIapathasV16V15FIamemaTuple2V15V9aemptyFAainfix &gt;=alengthV17acardinalaverticesIapathasV17V9FIamemV9averticesFIainfix &lt;ainfix -acardinalaverticesc1c1">
@@ -774,7 +774,7 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="4.24"/>
+         <result status="valid" time="0.78"/>
         </proof>
         <proof
          prover="1"
@@ -789,10 +789,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.8"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="postcondition"
-      sum="14230b3ef66fad126fdc86b63c5a01ae"
+      sum="c3a51ced03d070354afe6aa786ebedf6"
       proved="true"
       expanded="true"
       shape="Cagetainitialize_single_sourceasV3aFiniteVainfix &gt;=apath_weightV5V3V4IapathasV5V3FAainfix =apath_weightV6V3V4AapathasV6V3EaInfiniteapathasV7V3NFIamemV3averticesFIainv2ainitialize_single_sourceasaedgesIainfix =V2aTrueNNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -804,10 +804,10 @@
        expanded="true">
        <goal
         name="WP_parameter bellman_ford.8.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="postcondition"
-        sum="a60905d2b1f26d23beb73071aa906fe5"
+        sum="b48cbdca7fabcc0e03fc9063649d74ed"
         proved="true"
         expanded="true"
         shape="Cagetainitialize_single_sourceasV3aFiniteVainfix =apath_weightV5V3V4AapathasV5V3EaInfinitetIamemV3averticesFIainv2ainitialize_single_sourceasaedgesIainfix =V2aTrueNNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -819,15 +819,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.39"/>
+         <result status="valid" time="0.25"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter bellman_ford.8.2"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="postcondition"
-        sum="16b813cbf348f16d320e5f0a4730c93b"
+        sum="5184f51c969c0be06e0fdcc15cc69a09"
         proved="true"
         expanded="true"
         shape="Cagetainitialize_single_sourceasV3aFiniteVainfix &gt;=apath_weightV5V3V4IapathasV5V3FaInfinitetIamemV3averticesFIainv2ainitialize_single_sourceasaedgesIainfix =V2aTrueNNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -844,10 +844,10 @@
        </goal>
        <goal
         name="WP_parameter bellman_ford.8.3"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="postcondition"
-        sum="20e7af0f4e201b3b880e17274a6d8545"
+        sum="406719aff035f515c1fbdd517257363a"
         proved="true"
         expanded="true"
         shape="Cagetainitialize_single_sourceasV3aFiniteVtaInfiniteapathasV5V3NFIamemV3averticesFIainv2ainitialize_single_sourceasaedgesIainfix =V2aTrueNNIais_emptyV1qainfix =V2aTrueFIainv2ainitialize_single_sourceasadiffaedgesV1AasubsetV1aedgesFIainfix =V0aedgesFIainv1ainitialize_single_sourceasacardinalaverticesaemptyIainfix &gt;c1ainfix -acardinalaverticesc1">
@@ -859,7 +859,7 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="4.94"/>
+         <result status="valid" time="2.48"/>
         </proof>
         <proof
          prover="1"
@@ -882,10 +882,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.9"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop invariant init"
-      sum="8a95033fc1341581e7ad27e27cd02186"
+      sum="98ef36ee1e620f085eaca399ebe84f24"
       proved="true"
       expanded="true"
       shape="ainv1ainitialize_single_sourceasc1aemptyIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -902,10 +902,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.10"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop invariant init"
-      sum="8af0b911e540c10e4ea8476b95fbfa25"
+      sum="f392ce69de989e78339b3734876322b9"
       proved="true"
       expanded="true"
       shape="ainv1V0V1adiffaedgesV2AasubsetV2aedgesIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -917,10 +917,10 @@
        expanded="true">
        <goal
         name="WP_parameter bellman_ford.10.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="parameter bellman_ford"
-        sum="fbe710c3dc456b99ddc5d7fe2de758bd"
+        sum="f123371b70433644ed872f7acd4edd14"
         proved="true"
         expanded="true"
         shape="asubsetV2aedgesIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -937,10 +937,10 @@
        </goal>
        <goal
         name="WP_parameter bellman_ford.10.2"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="parameter bellman_ford"
-        sum="24785e51b9c5224d866bed3032c6d791"
+        sum="8843b7cbc91ccc9d9d91eedf52d658a5"
         proved="true"
         expanded="true"
         shape="ainv1V0V1adiffaedgesV2Iainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -959,10 +959,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.11"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="precondition"
-      sum="28b9e3de80487b95403b732766b76eeb"
+      sum="362e413e82073270c8deab116daec3b5"
       proved="true"
       expanded="true"
       shape="ais_emptyV3NIainfix =V5aTrueNIais_emptyV3qainfix =V5aTrueFIainv1V4V1adiffaedgesV3AasubsetV3aedgesFIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -979,10 +979,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.12"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="precondition"
-      sum="5e7ccd421ec8b53f34cd1961ed1efac9"
+      sum="0a69d41035eacdbc1de90a30acbab431"
       proved="true"
       expanded="true"
       shape="amemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix &lt;=c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIais_emptyV3NIainfix =V5aTrueNIais_emptyV3qainfix =V5aTrueFIainv1V4V1adiffaedgesV3AasubsetV3aedgesFIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -999,10 +999,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.13"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="precondition"
-      sum="4a20894830df72dc229b9ff94a5a0c2d"
+      sum="7560849d32c2e9d3a876e2d850936bae"
       proved="true"
       expanded="true"
       shape="ainv1V4V1adiffaedgesV3Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIais_emptyV3NIainfix =V5aTrueNIais_emptyV3qainfix =V5aTrueFIainv1V4V1adiffaedgesV3AasubsetV3aedgesFIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1019,10 +1019,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.14"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop invariant preservation"
-      sum="4deeb84749f9e7b815c59bdff4183e76"
+      sum="407e4346d441f5ff4ca702a5b9f1304d"
       proved="true"
       expanded="true"
       shape="ainv1V10V1adiffaedgesV6AasubsetV6aedgesIainv1V10V1aaddaTuple2V7V8adiffaedgesV3FIainv1V4V1adiffaedgesV3AamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix &lt;=c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIais_emptyV3NIainfix =V5aTrueNIais_emptyV3qainfix =V5aTrueFIainv1V4V1adiffaedgesV3AasubsetV3aedgesFIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1034,10 +1034,10 @@
        expanded="true">
        <goal
         name="WP_parameter bellman_ford.14.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="parameter bellman_ford"
-        sum="71cb361c57484de7a2a051af7290ac83"
+        sum="ee8ed112e580cc3746261bd2115ea7c4"
         proved="true"
         expanded="false"
         shape="asubsetV6aedgesIainv1V10V1aaddaTuple2V7V8adiffaedgesV3FIainv1V4V1adiffaedgesV3AamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix &lt;=c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIais_emptyV3NIainfix =V5aTrueNIais_emptyV3qainfix =V5aTrueFIainv1V4V1adiffaedgesV3AasubsetV3aedgesFIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1054,10 +1054,10 @@
        </goal>
        <goal
         name="WP_parameter bellman_ford.14.2"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="parameter bellman_ford"
-        sum="2180386a8d049c2ddf21fb23fa26bfdf"
+        sum="51d790b9a9de03b38c254d1e370467e8"
         proved="true"
         expanded="true"
         shape="ainv1V10V1adiffaedgesV6Iainv1V10V1aaddaTuple2V7V8adiffaedgesV3FIainv1V4V1adiffaedgesV3AamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix &lt;=c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIais_emptyV3NIainfix =V5aTrueNIais_emptyV3qainfix =V5aTrueFIainv1V4V1adiffaedgesV3AasubsetV3aedgesFIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1069,10 +1069,10 @@
          expanded="true">
          <goal
           name="WP_parameter bellman_ford.14.2.1"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="186" loccnumb="6" loccnume="18"
           expl="parameter bellman_ford"
-          sum="4c7b8c9ffcffe1a1a3eaa31f835c5cac"
+          sum="baa8d54c82e4db65c430218a64e540ca"
           proved="true"
           expanded="true"
           shape="Camixfix []V10V11aFiniteVainfix &gt;=ainfix +apath_weightV14V13aweightV13V11V12IamemaTuple2V13V11adiffaedgesV6Iainfix &lt;alengthV14V1IapathasV14V13FAainfix &gt;=apath_weightV15V11V12Iainfix &lt;alengthV15V1IapathasV15V11FAainfix =apath_weightV16V11V12AapathasV16V11EaInfiniteainfix &gt;=alengthV18V1IapathasV18V17FIamemaTuple2V17V11adiffaedgesV6FAainfix &gt;=alengthV19V1IapathasV19V11FIamemV11averticesFICamixfix []V10V20aFiniteVainfix &gt;=ainfix +apath_weightV23V22aweightV22V20V21IamemaTuple2V22V20aaddaTuple2V7V8adiffaedgesV3Iainfix &lt;alengthV23V1IapathasV23V22FAainfix &gt;=apath_weightV24V20V21Iainfix &lt;alengthV24V1IapathasV24V20FAainfix =apath_weightV25V20V21AapathasV25V20EaInfiniteainfix &gt;=alengthV27V1IapathasV27V26FIamemaTuple2V26V20aaddaTuple2V7V8adiffaedgesV3FAainfix &gt;=alengthV28V1IapathasV28V20FIamemV20averticesFFICamixfix []V4V29aFiniteVainfix &gt;=ainfix +apath_weightV32V31aweightV31V29V30IamemaTuple2V31V29adiffaedgesV3Iainfix &lt;alengthV32V1IapathasV32V31FAainfix &gt;=apath_weightV33V29V30Iainfix &lt;alengthV33V1IapathasV33V29FAainfix =apath_weightV34V29V30AapathasV34V29EaInfiniteainfix &gt;=alengthV36V1IapathasV36V35FIamemaTuple2V35V29adiffaedgesV3FAainfix &gt;=alengthV37V1IapathasV37V29FIamemV29averticesFAamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix =c1V1Oainfix &lt;c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIamemV38V3NFNIainfix =V5aTrueNIamemV39V3NFqainfix =V5aTrueFICamixfix []V4V40aFiniteVainfix &gt;=ainfix +apath_weightV43V42aweightV42V40V41IamemaTuple2V42V40adiffaedgesV3Iainfix &lt;alengthV43V1IapathasV43V42FAainfix &gt;=apath_weightV44V40V41Iainfix &lt;alengthV44V1IapathasV44V40FAainfix =apath_weightV45V40V41AapathasV45V40EaInfiniteainfix &gt;=alengthV47V1IapathasV47V46FIamemaTuple2V46V40adiffaedgesV3FAainfix &gt;=alengthV48V1IapathasV48V40FIamemV40averticesFAamemV49aedgesIamemV49V3FFIainfix =V2aedgesFICamixfix []V0V50aFiniteVainfix &gt;=ainfix +apath_weightV53V52aweightV52V50V51IamemaTuple2V52V50aemptyIainfix &lt;alengthV53V1IapathasV53V52FAainfix &gt;=apath_weightV54V50V51Iainfix &lt;alengthV54V1IapathasV54V50FAainfix =apath_weightV55V50V51AapathasV55V50EaInfiniteainfix &gt;=alengthV57V1IapathasV57V56FIamemaTuple2V56V50aemptyFAainfix &gt;=alengthV58V1IapathasV58V50FIamemV50averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1084,10 +1084,10 @@
            expanded="true">
            <goal
             name="WP_parameter bellman_ford.14.2.1.1"
-            locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+            locfile="programs/bellman_ford/../bellman_ford.mlw"
             loclnum="186" loccnumb="6" loccnume="18"
             expl="parameter bellman_ford"
-            sum="345e785ebe0e128cd1bc4d5245837b49"
+            sum="93ae2e265043923898aab05680d72ba6"
             proved="true"
             expanded="false"
             shape="Camixfix []V10V11aFiniteVainfix =apath_weightV13V11V12AapathasV13V11EaInfinitetIamemV11averticesFICamixfix []V10V14aFiniteVainfix &gt;=ainfix +apath_weightV17V16aweightV16V14V15IamemaTuple2V16V14aaddaTuple2V7V8adiffaedgesV3Iainfix &lt;alengthV17V1IapathasV17V16FAainfix &gt;=apath_weightV18V14V15Iainfix &lt;alengthV18V1IapathasV18V14FAainfix =apath_weightV19V14V15AapathasV19V14EaInfiniteainfix &gt;=alengthV21V1IapathasV21V20FIamemaTuple2V20V14aaddaTuple2V7V8adiffaedgesV3FAainfix &gt;=alengthV22V1IapathasV22V14FIamemV14averticesFFICamixfix []V4V23aFiniteVainfix &gt;=ainfix +apath_weightV26V25aweightV25V23V24IamemaTuple2V25V23adiffaedgesV3Iainfix &lt;alengthV26V1IapathasV26V25FAainfix &gt;=apath_weightV27V23V24Iainfix &lt;alengthV27V1IapathasV27V23FAainfix =apath_weightV28V23V24AapathasV28V23EaInfiniteainfix &gt;=alengthV30V1IapathasV30V29FIamemaTuple2V29V23adiffaedgesV3FAainfix &gt;=alengthV31V1IapathasV31V23FIamemV23averticesFAamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix =c1V1Oainfix &lt;c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIamemV32V3NFNIainfix =V5aTrueNIamemV33V3NFqainfix =V5aTrueFICamixfix []V4V34aFiniteVainfix &gt;=ainfix +apath_weightV37V36aweightV36V34V35IamemaTuple2V36V34adiffaedgesV3Iainfix &lt;alengthV37V1IapathasV37V36FAainfix &gt;=apath_weightV38V34V35Iainfix &lt;alengthV38V1IapathasV38V34FAainfix =apath_weightV39V34V35AapathasV39V34EaInfiniteainfix &gt;=alengthV41V1IapathasV41V40FIamemaTuple2V40V34adiffaedgesV3FAainfix &gt;=alengthV42V1IapathasV42V34FIamemV34averticesFAamemV43aedgesIamemV43V3FFIainfix =V2aedgesFICamixfix []V0V44aFiniteVainfix &gt;=ainfix +apath_weightV47V46aweightV46V44V45IamemaTuple2V46V44aemptyIainfix &lt;alengthV47V1IapathasV47V46FAainfix &gt;=apath_weightV48V44V45Iainfix &lt;alengthV48V1IapathasV48V44FAainfix =apath_weightV49V44V45AapathasV49V44EaInfiniteainfix &gt;=alengthV51V1IapathasV51V50FIamemaTuple2V50V44aemptyFAainfix &gt;=alengthV52V1IapathasV52V44FIamemV44averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1112,10 +1112,10 @@
            </goal>
            <goal
             name="WP_parameter bellman_ford.14.2.1.2"
-            locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+            locfile="programs/bellman_ford/../bellman_ford.mlw"
             loclnum="186" loccnumb="6" loccnume="18"
             expl="parameter bellman_ford"
-            sum="bc72d4cda9de3e3ed5edcb167c5b9175"
+            sum="905de208fc2c4aa4b92d3e66880ccfea"
             proved="true"
             expanded="false"
             shape="Camixfix []V10V11aFiniteVainfix &gt;=apath_weightV13V11V12Iainfix &lt;alengthV13V1IapathasV13V11FaInfinitetIamemV11averticesFICamixfix []V10V14aFiniteVainfix &gt;=ainfix +apath_weightV17V16aweightV16V14V15IamemaTuple2V16V14aaddaTuple2V7V8adiffaedgesV3Iainfix &lt;alengthV17V1IapathasV17V16FAainfix &gt;=apath_weightV18V14V15Iainfix &lt;alengthV18V1IapathasV18V14FAainfix =apath_weightV19V14V15AapathasV19V14EaInfiniteainfix &gt;=alengthV21V1IapathasV21V20FIamemaTuple2V20V14aaddaTuple2V7V8adiffaedgesV3FAainfix &gt;=alengthV22V1IapathasV22V14FIamemV14averticesFFICamixfix []V4V23aFiniteVainfix &gt;=ainfix +apath_weightV26V25aweightV25V23V24IamemaTuple2V25V23adiffaedgesV3Iainfix &lt;alengthV26V1IapathasV26V25FAainfix &gt;=apath_weightV27V23V24Iainfix &lt;alengthV27V1IapathasV27V23FAainfix =apath_weightV28V23V24AapathasV28V23EaInfiniteainfix &gt;=alengthV30V1IapathasV30V29FIamemaTuple2V29V23adiffaedgesV3FAainfix &gt;=alengthV31V1IapathasV31V23FIamemV23averticesFAamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix =c1V1Oainfix &lt;c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIamemV32V3NFNIainfix =V5aTrueNIamemV33V3NFqainfix =V5aTrueFICamixfix []V4V34aFiniteVainfix &gt;=ainfix +apath_weightV37V36aweightV36V34V35IamemaTuple2V36V34adiffaedgesV3Iainfix &lt;alengthV37V1IapathasV37V36FAainfix &gt;=apath_weightV38V34V35Iainfix &lt;alengthV38V1IapathasV38V34FAainfix =apath_weightV39V34V35AapathasV39V34EaInfiniteainfix &gt;=alengthV41V1IapathasV41V40FIamemaTuple2V40V34adiffaedgesV3FAainfix &gt;=alengthV42V1IapathasV42V34FIamemV34averticesFAamemV43aedgesIamemV43V3FFIainfix =V2aedgesFICamixfix []V0V44aFiniteVainfix &gt;=ainfix +apath_weightV47V46aweightV46V44V45IamemaTuple2V46V44aemptyIainfix &lt;alengthV47V1IapathasV47V46FAainfix &gt;=apath_weightV48V44V45Iainfix &lt;alengthV48V1IapathasV48V44FAainfix =apath_weightV49V44V45AapathasV49V44EaInfiniteainfix &gt;=alengthV51V1IapathasV51V50FIamemaTuple2V50V44aemptyFAainfix &gt;=alengthV52V1IapathasV52V44FIamemV44averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1140,10 +1140,10 @@
            </goal>
            <goal
             name="WP_parameter bellman_ford.14.2.1.3"
-            locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+            locfile="programs/bellman_ford/../bellman_ford.mlw"
             loclnum="186" loccnumb="6" loccnume="18"
             expl="parameter bellman_ford"
-            sum="d664d18a95c9285b94765c4aa70689c9"
+            sum="083ee9e6813c82e64345d9b24ad09b47"
             proved="true"
             expanded="true"
             shape="Camixfix []V10V11aFiniteVainfix &gt;=ainfix +apath_weightV14V13aweightV13V11V12IamemaTuple2V13V11adiffaedgesV6Iainfix &lt;alengthV14V1IapathasV14V13FaInfinitetIamemV11averticesFICamixfix []V10V15aFiniteVainfix &gt;=ainfix +apath_weightV18V17aweightV17V15V16IamemaTuple2V17V15aaddaTuple2V7V8adiffaedgesV3Iainfix &lt;alengthV18V1IapathasV18V17FAainfix &gt;=apath_weightV19V15V16Iainfix &lt;alengthV19V1IapathasV19V15FAainfix =apath_weightV20V15V16AapathasV20V15EaInfiniteainfix &gt;=alengthV22V1IapathasV22V21FIamemaTuple2V21V15aaddaTuple2V7V8adiffaedgesV3FAainfix &gt;=alengthV23V1IapathasV23V15FIamemV15averticesFFICamixfix []V4V24aFiniteVainfix &gt;=ainfix +apath_weightV27V26aweightV26V24V25IamemaTuple2V26V24adiffaedgesV3Iainfix &lt;alengthV27V1IapathasV27V26FAainfix &gt;=apath_weightV28V24V25Iainfix &lt;alengthV28V1IapathasV28V24FAainfix =apath_weightV29V24V25AapathasV29V24EaInfiniteainfix &gt;=alengthV31V1IapathasV31V30FIamemaTuple2V30V24adiffaedgesV3FAainfix &gt;=alengthV32V1IapathasV32V24FIamemV24averticesFAamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix =c1V1Oainfix &lt;c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIamemV33V3NFNIainfix =V5aTrueNIamemV34V3NFqainfix =V5aTrueFICamixfix []V4V35aFiniteVainfix &gt;=ainfix +apath_weightV38V37aweightV37V35V36IamemaTuple2V37V35adiffaedgesV3Iainfix &lt;alengthV38V1IapathasV38V37FAainfix &gt;=apath_weightV39V35V36Iainfix &lt;alengthV39V1IapathasV39V35FAainfix =apath_weightV40V35V36AapathasV40V35EaInfiniteainfix &gt;=alengthV42V1IapathasV42V41FIamemaTuple2V41V35adiffaedgesV3FAainfix &gt;=alengthV43V1IapathasV43V35FIamemV35averticesFAamemV44aedgesIamemV44V3FFIainfix =V2aedgesFICamixfix []V0V45aFiniteVainfix &gt;=ainfix +apath_weightV48V47aweightV47V45V46IamemaTuple2V47V45aemptyIainfix &lt;alengthV48V1IapathasV48V47FAainfix &gt;=apath_weightV49V45V46Iainfix &lt;alengthV49V1IapathasV49V45FAainfix =apath_weightV50V45V46AapathasV50V45EaInfiniteainfix &gt;=alengthV52V1IapathasV52V51FIamemaTuple2V51V45aemptyFAainfix &gt;=alengthV53V1IapathasV53V45FIamemV45averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1160,10 +1160,10 @@
            </goal>
            <goal
             name="WP_parameter bellman_ford.14.2.1.4"
-            locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+            locfile="programs/bellman_ford/../bellman_ford.mlw"
             loclnum="186" loccnumb="6" loccnume="18"
             expl="parameter bellman_ford"
-            sum="8449cb8d42e1b98682b3fd6aa9399282"
+            sum="76e27440415208233268f757a6f4881d"
             proved="true"
             expanded="false"
             shape="Camixfix []V10V11aFiniteVtaInfiniteainfix &gt;=alengthV13V1IapathasV13V11FIamemV11averticesFICamixfix []V10V14aFiniteVainfix &gt;=ainfix +apath_weightV17V16aweightV16V14V15IamemaTuple2V16V14aaddaTuple2V7V8adiffaedgesV3Iainfix &lt;alengthV17V1IapathasV17V16FAainfix &gt;=apath_weightV18V14V15Iainfix &lt;alengthV18V1IapathasV18V14FAainfix =apath_weightV19V14V15AapathasV19V14EaInfiniteainfix &gt;=alengthV21V1IapathasV21V20FIamemaTuple2V20V14aaddaTuple2V7V8adiffaedgesV3FAainfix &gt;=alengthV22V1IapathasV22V14FIamemV14averticesFFICamixfix []V4V23aFiniteVainfix &gt;=ainfix +apath_weightV26V25aweightV25V23V24IamemaTuple2V25V23adiffaedgesV3Iainfix &lt;alengthV26V1IapathasV26V25FAainfix &gt;=apath_weightV27V23V24Iainfix &lt;alengthV27V1IapathasV27V23FAainfix =apath_weightV28V23V24AapathasV28V23EaInfiniteainfix &gt;=alengthV30V1IapathasV30V29FIamemaTuple2V29V23adiffaedgesV3FAainfix &gt;=alengthV31V1IapathasV31V23FIamemV23averticesFAamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix =c1V1Oainfix &lt;c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIamemV32V3NFNIainfix =V5aTrueNIamemV33V3NFqainfix =V5aTrueFICamixfix []V4V34aFiniteVainfix &gt;=ainfix +apath_weightV37V36aweightV36V34V35IamemaTuple2V36V34adiffaedgesV3Iainfix &lt;alengthV37V1IapathasV37V36FAainfix &gt;=apath_weightV38V34V35Iainfix &lt;alengthV38V1IapathasV38V34FAainfix =apath_weightV39V34V35AapathasV39V34EaInfiniteainfix &gt;=alengthV41V1IapathasV41V40FIamemaTuple2V40V34adiffaedgesV3FAainfix &gt;=alengthV42V1IapathasV42V34FIamemV34averticesFAamemV43aedgesIamemV43V3FFIainfix =V2aedgesFICamixfix []V0V44aFiniteVainfix &gt;=ainfix +apath_weightV47V46aweightV46V44V45IamemaTuple2V46V44aemptyIainfix &lt;alengthV47V1IapathasV47V46FAainfix &gt;=apath_weightV48V44V45Iainfix &lt;alengthV48V1IapathasV48V44FAainfix =apath_weightV49V44V45AapathasV49V44EaInfiniteainfix &gt;=alengthV51V1IapathasV51V50FIamemaTuple2V50V44aemptyFAainfix &gt;=alengthV52V1IapathasV52V44FIamemV44averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1188,10 +1188,10 @@
            </goal>
            <goal
             name="WP_parameter bellman_ford.14.2.1.5"
-            locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+            locfile="programs/bellman_ford/../bellman_ford.mlw"
             loclnum="186" loccnumb="6" loccnume="18"
             expl="parameter bellman_ford"
-            sum="8184c55b0f0b4629ab83ad538c0e03bd"
+            sum="d122bb22fd1fb591d64c51b766c2becf"
             proved="true"
             expanded="true"
             shape="Camixfix []V10V11aFiniteVtaInfiniteainfix &gt;=alengthV14V1IapathasV14V13FIamemaTuple2V13V11adiffaedgesV6FIamemV11averticesFICamixfix []V10V15aFiniteVainfix &gt;=ainfix +apath_weightV18V17aweightV17V15V16IamemaTuple2V17V15aaddaTuple2V7V8adiffaedgesV3Iainfix &lt;alengthV18V1IapathasV18V17FAainfix &gt;=apath_weightV19V15V16Iainfix &lt;alengthV19V1IapathasV19V15FAainfix =apath_weightV20V15V16AapathasV20V15EaInfiniteainfix &gt;=alengthV22V1IapathasV22V21FIamemaTuple2V21V15aaddaTuple2V7V8adiffaedgesV3FAainfix &gt;=alengthV23V1IapathasV23V15FIamemV15averticesFFICamixfix []V4V24aFiniteVainfix &gt;=ainfix +apath_weightV27V26aweightV26V24V25IamemaTuple2V26V24adiffaedgesV3Iainfix &lt;alengthV27V1IapathasV27V26FAainfix &gt;=apath_weightV28V24V25Iainfix &lt;alengthV28V1IapathasV28V24FAainfix =apath_weightV29V24V25AapathasV29V24EaInfiniteainfix &gt;=alengthV31V1IapathasV31V30FIamemaTuple2V30V24adiffaedgesV3FAainfix &gt;=alengthV32V1IapathasV32V24FIamemV24averticesFAamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix =c1V1Oainfix &lt;c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIamemV33V3NFNIainfix =V5aTrueNIamemV34V3NFqainfix =V5aTrueFICamixfix []V4V35aFiniteVainfix &gt;=ainfix +apath_weightV38V37aweightV37V35V36IamemaTuple2V37V35adiffaedgesV3Iainfix &lt;alengthV38V1IapathasV38V37FAainfix &gt;=apath_weightV39V35V36Iainfix &lt;alengthV39V1IapathasV39V35FAainfix =apath_weightV40V35V36AapathasV40V35EaInfiniteainfix &gt;=alengthV42V1IapathasV42V41FIamemaTuple2V41V35adiffaedgesV3FAainfix &gt;=alengthV43V1IapathasV43V35FIamemV35averticesFAamemV44aedgesIamemV44V3FFIainfix =V2aedgesFICamixfix []V0V45aFiniteVainfix &gt;=ainfix +apath_weightV48V47aweightV47V45V46IamemaTuple2V47V45aemptyIainfix &lt;alengthV48V1IapathasV48V47FAainfix &gt;=apath_weightV49V45V46Iainfix &lt;alengthV49V1IapathasV49V45FAainfix =apath_weightV50V45V46AapathasV50V45EaInfiniteainfix &gt;=alengthV52V1IapathasV52V51FIamemaTuple2V51V45aemptyFAainfix &gt;=alengthV53V1IapathasV53V45FIamemV45averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1214,10 +1214,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.15"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop variant decrease"
-      sum="6ceba9fa1d298cc33e1d8d84a863bd99"
+      sum="f0639df7862ac835cbc2809f3f773d34"
       proved="true"
       expanded="false"
       shape="ainfix &lt;acardinalV6acardinalV3Aainfix &lt;=c0acardinalV3Iainv1V10V1aaddaTuple2V7V8adiffaedgesV3FIainv1V4V1adiffaedgesV3AamemaTuple2V7V8adiffaedgesV3NAamemaTuple2V7V8aedgesAainfix &lt;=c1V1Iainfix =V6aremoveV9V3AamemV9V3LaTuple2V7V8FFIais_emptyV3NIainfix =V5aTrueNIais_emptyV3qainfix =V5aTrueFIainv1V4V1adiffaedgesV3AasubsetV3aedgesFIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1234,10 +1234,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.16"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="assertion"
-      sum="d7b3299ecb6113a9417aeeccf2947947"
+      sum="ee0356356fce714a3be574d757fff8d9"
       proved="true"
       expanded="true"
       shape="ainv1V4V1aedgesIainfix =V5aTrueNNIais_emptyV3qainfix =V5aTrueFIainv1V4V1adiffaedgesV3AasubsetV3aedgesFIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1249,10 +1249,10 @@
        expanded="true">
        <goal
         name="WP_parameter bellman_ford.16.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="assertion"
-        sum="a7cdb16f1533c5b8da17bb366c1f3935"
+        sum="a9102956ae5ed3db68753c5242df6e74"
         proved="true"
         expanded="true"
         shape="Camixfix []V4V6aFiniteVainfix &gt;=ainfix +apath_weightV9V8aweightV8V6V7IamemaTuple2V8V6aedgesIainfix &lt;alengthV9V1IapathasV9V8FAainfix &gt;=apath_weightV10V6V7Iainfix &lt;alengthV10V1IapathasV10V6FAainfix =apath_weightV11V6V7AapathasV11V6EaInfiniteainfix &gt;=alengthV13V1IapathasV13V12FIamemaTuple2V12V6aedgesFAainfix &gt;=alengthV14V1IapathasV14V6FIamemV6averticesFIainfix =V5aTrueNNIamemV15V3NFqainfix =V5aTrueFICamixfix []V4V16aFiniteVainfix &gt;=ainfix +apath_weightV19V18aweightV18V16V17IamemaTuple2V18V16adiffaedgesV3Iainfix &lt;alengthV19V1IapathasV19V18FAainfix &gt;=apath_weightV20V16V17Iainfix &lt;alengthV20V1IapathasV20V16FAainfix =apath_weightV21V16V17AapathasV21V16EaInfiniteainfix &gt;=alengthV23V1IapathasV23V22FIamemaTuple2V22V16adiffaedgesV3FAainfix &gt;=alengthV24V1IapathasV24V16FIamemV16averticesFAamemV25aedgesIamemV25V3FFIainfix =V2aedgesFICamixfix []V0V26aFiniteVainfix &gt;=ainfix +apath_weightV29V28aweightV28V26V27IamemaTuple2V28V26aemptyIainfix &lt;alengthV29V1IapathasV29V28FAainfix &gt;=apath_weightV30V26V27Iainfix &lt;alengthV30V1IapathasV30V26FAainfix =apath_weightV31V26V27AapathasV31V26EaInfiniteainfix &gt;=alengthV33V1IapathasV33V32FIamemaTuple2V32V26aemptyFAainfix &gt;=alengthV34V1IapathasV34V26FIamemV26averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1264,17 +1264,17 @@
          memlimit="1000"
          obsolete="false"
          archived="false">
-         <result status="valid" time="26.71"/>
+         <result status="valid" time="45.23"/>
         </proof>
        </goal>
       </transf>
      </goal>
      <goal
       name="WP_parameter bellman_ford.17"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop invariant preservation"
-      sum="136d1c49cea0e1cf96efd456f4dc2534"
+      sum="0a194f044a5c6cd6d9249f8784d14c8f"
       proved="true"
       expanded="true"
       shape="ainv1V4ainfix +V1c1aemptyIainv1V4V1aedgesIainfix =V5aTrueNNIais_emptyV3qainfix =V5aTrueFIainv1V4V1adiffaedgesV3AasubsetV3aedgesFIainfix =V2aedgesFIainv1V0V1aemptyIainfix &lt;=V1ainfix -acardinalaverticesc1Aainfix &lt;=c1V1FFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1286,10 +1286,10 @@
        expanded="true">
        <goal
         name="WP_parameter bellman_ford.17.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="loop invariant preservation"
-        sum="f9c5abf19b6b932e4e016a1728c3e333"
+        sum="6b7e4caedfaeb5d7f7094be70c44b42e"
         proved="true"
         expanded="true"
         shape="Camixfix []V4V6aFiniteVainfix &gt;=ainfix +apath_weightV9V8aweightV8V6V7IamemaTuple2V8V6aemptyIainfix &lt;alengthV9ainfix +V1c1IapathasV9V8FAainfix &gt;=apath_weightV10V6V7Iainfix &lt;alengthV10ainfix +V1c1IapathasV10V6FAainfix =apath_weightV11V6V7AapathasV11V6EaInfiniteainfix &gt;=alengthV13ainfix +V1c1IapathasV13V12FIamemaTuple2V12V6aemptyFAainfix &gt;=alengthV14ainfix +V1c1IapathasV14V6FIamemV6averticesFICamixfix []V4V15aFiniteVainfix &gt;=ainfix +apath_weightV18V17aweightV17V15V16IamemaTuple2V17V15aedgesIainfix &lt;alengthV18V1IapathasV18V17FAainfix &gt;=apath_weightV19V15V16Iainfix &lt;alengthV19V1IapathasV19V15FAainfix =apath_weightV20V15V16AapathasV20V15EaInfiniteainfix &gt;=alengthV22V1IapathasV22V21FIamemaTuple2V21V15aedgesFAainfix &gt;=alengthV23V1IapathasV23V15FIamemV15averticesFIainfix =V5aTrueNNIamemV24V3NFqainfix =V5aTrueFICamixfix []V4V25aFiniteVainfix &gt;=ainfix +apath_weightV28V27aweightV27V25V26IamemaTuple2V27V25adiffaedgesV3Iainfix &lt;alengthV28V1IapathasV28V27FAainfix &gt;=apath_weightV29V25V26Iainfix &lt;alengthV29V1IapathasV29V25FAainfix =apath_weightV30V25V26AapathasV30V25EaInfiniteainfix &gt;=alengthV32V1IapathasV32V31FIamemaTuple2V31V25adiffaedgesV3FAainfix &gt;=alengthV33V1IapathasV33V25FIamemV25averticesFAamemV34aedgesIamemV34V3FFIainfix =V2aedgesFICamixfix []V0V35aFiniteVainfix &gt;=ainfix +apath_weightV38V37aweightV37V35V36IamemaTuple2V37V35aemptyIainfix &lt;alengthV38V1IapathasV38V37FAainfix &gt;=apath_weightV39V35V36Iainfix &lt;alengthV39V1IapathasV39V35FAainfix =apath_weightV40V35V36AapathasV40V35EaInfiniteainfix &gt;=alengthV42V1IapathasV42V41FIamemaTuple2V41V35aemptyFAainfix &gt;=alengthV43V1IapathasV43V35FIamemV35averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1301,10 +1301,10 @@
          expanded="true">
          <goal
           name="WP_parameter bellman_ford.17.1.1"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="186" loccnumb="6" loccnume="18"
           expl="loop invariant preservation"
-          sum="1cef3bce01d0efcdfcd27dfa77dab534"
+          sum="0351209dce3efb726bf4168eac8ad3ff"
           proved="true"
           expanded="false"
           shape="Camixfix []V4V6aFiniteVainfix =apath_weightV8V6V7AapathasV8V6EaInfinitetIamemV6averticesFICamixfix []V4V9aFiniteVainfix &gt;=ainfix +apath_weightV12V11aweightV11V9V10IamemaTuple2V11V9aedgesIainfix &lt;alengthV12V1IapathasV12V11FAainfix &gt;=apath_weightV13V9V10Iainfix &lt;alengthV13V1IapathasV13V9FAainfix =apath_weightV14V9V10AapathasV14V9EaInfiniteainfix &gt;=alengthV16V1IapathasV16V15FIamemaTuple2V15V9aedgesFAainfix &gt;=alengthV17V1IapathasV17V9FIamemV9averticesFIainfix =V5aTrueNNIamemV18V3NFqainfix =V5aTrueFICamixfix []V4V19aFiniteVainfix &gt;=ainfix +apath_weightV22V21aweightV21V19V20IamemaTuple2V21V19adiffaedgesV3Iainfix &lt;alengthV22V1IapathasV22V21FAainfix &gt;=apath_weightV23V19V20Iainfix &lt;alengthV23V1IapathasV23V19FAainfix =apath_weightV24V19V20AapathasV24V19EaInfiniteainfix &gt;=alengthV26V1IapathasV26V25FIamemaTuple2V25V19adiffaedgesV3FAainfix &gt;=alengthV27V1IapathasV27V19FIamemV19averticesFAamemV28aedgesIamemV28V3FFIainfix =V2aedgesFICamixfix []V0V29aFiniteVainfix &gt;=ainfix +apath_weightV32V31aweightV31V29V30IamemaTuple2V31V29aemptyIainfix &lt;alengthV32V1IapathasV32V31FAainfix &gt;=apath_weightV33V29V30Iainfix &lt;alengthV33V1IapathasV33V29FAainfix =apath_weightV34V29V30AapathasV34V29EaInfiniteainfix &gt;=alengthV36V1IapathasV36V35FIamemaTuple2V35V29aemptyFAainfix &gt;=alengthV37V1IapathasV37V29FIamemV29averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1316,15 +1316,15 @@
            memlimit="1000"
            obsolete="false"
            archived="false">
-           <result status="valid" time="1.76"/>
+           <result status="valid" time="1.46"/>
           </proof>
          </goal>
          <goal
           name="WP_parameter bellman_ford.17.1.2"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="186" loccnumb="6" loccnume="18"
           expl="loop invariant preservation"
-          sum="d1150dc837bcb45a4f987de61ef29b5f"
+          sum="7b9845f4df0749347c1d0bb1167a6fd8"
           proved="true"
           expanded="true"
           shape="Camixfix []V4V6aFiniteVainfix &gt;=apath_weightV8V6V7Iainfix &lt;alengthV8ainfix +V1c1IapathasV8V6FaInfinitetIamemV6averticesFICamixfix []V4V9aFiniteVainfix &gt;=ainfix +apath_weightV12V11aweightV11V9V10IamemaTuple2V11V9aedgesIainfix &lt;alengthV12V1IapathasV12V11FAainfix &gt;=apath_weightV13V9V10Iainfix &lt;alengthV13V1IapathasV13V9FAainfix =apath_weightV14V9V10AapathasV14V9EaInfiniteainfix &gt;=alengthV16V1IapathasV16V15FIamemaTuple2V15V9aedgesFAainfix &gt;=alengthV17V1IapathasV17V9FIamemV9averticesFIainfix =V5aTrueNNIamemV18V3NFqainfix =V5aTrueFICamixfix []V4V19aFiniteVainfix &gt;=ainfix +apath_weightV22V21aweightV21V19V20IamemaTuple2V21V19adiffaedgesV3Iainfix &lt;alengthV22V1IapathasV22V21FAainfix &gt;=apath_weightV23V19V20Iainfix &lt;alengthV23V1IapathasV23V19FAainfix =apath_weightV24V19V20AapathasV24V19EaInfiniteainfix &gt;=alengthV26V1IapathasV26V25FIamemaTuple2V25V19adiffaedgesV3FAainfix &gt;=alengthV27V1IapathasV27V19FIamemV19averticesFAamemV28aedgesIamemV28V3FFIainfix =V2aedgesFICamixfix []V0V29aFiniteVainfix &gt;=ainfix +apath_weightV32V31aweightV31V29V30IamemaTuple2V31V29aemptyIainfix &lt;alengthV32V1IapathasV32V31FAainfix &gt;=apath_weightV33V29V30Iainfix &lt;alengthV33V1IapathasV33V29FAainfix =apath_weightV34V29V30AapathasV34V29EaInfiniteainfix &gt;=alengthV36V1IapathasV36V35FIamemaTuple2V35V29aemptyFAainfix &gt;=alengthV37V1IapathasV37V29FIamemV29averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1342,10 +1342,10 @@
          </goal>
          <goal
           name="WP_parameter bellman_ford.17.1.3"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="186" loccnumb="6" loccnume="18"
           expl="loop invariant preservation"
-          sum="b2ad583b1872104b468a1bb5ba17cbda"
+          sum="3771b2af6fb20e315e1d19e13220ef0f"
           proved="true"
           expanded="false"
           shape="Camixfix []V4V6aFiniteVainfix &gt;=ainfix +apath_weightV9V8aweightV8V6V7IamemaTuple2V8V6aemptyIainfix &lt;alengthV9ainfix +V1c1IapathasV9V8FaInfinitetIamemV6averticesFICamixfix []V4V10aFiniteVainfix &gt;=ainfix +apath_weightV13V12aweightV12V10V11IamemaTuple2V12V10aedgesIainfix &lt;alengthV13V1IapathasV13V12FAainfix &gt;=apath_weightV14V10V11Iainfix &lt;alengthV14V1IapathasV14V10FAainfix =apath_weightV15V10V11AapathasV15V10EaInfiniteainfix &gt;=alengthV17V1IapathasV17V16FIamemaTuple2V16V10aedgesFAainfix &gt;=alengthV18V1IapathasV18V10FIamemV10averticesFIainfix =V5aTrueNNIamemV19V3NFqainfix =V5aTrueFICamixfix []V4V20aFiniteVainfix &gt;=ainfix +apath_weightV23V22aweightV22V20V21IamemaTuple2V22V20adiffaedgesV3Iainfix &lt;alengthV23V1IapathasV23V22FAainfix &gt;=apath_weightV24V20V21Iainfix &lt;alengthV24V1IapathasV24V20FAainfix =apath_weightV25V20V21AapathasV25V20EaInfiniteainfix &gt;=alengthV27V1IapathasV27V26FIamemaTuple2V26V20adiffaedgesV3FAainfix &gt;=alengthV28V1IapathasV28V20FIamemV20averticesFAamemV29aedgesIamemV29V3FFIainfix =V2aedgesFICamixfix []V0V30aFiniteVainfix &gt;=ainfix +apath_weightV33V32aweightV32V30V31IamemaTuple2V32V30aemptyIainfix &lt;alengthV33V1IapathasV33V32FAainfix &gt;=apath_weightV34V30V31Iainfix &lt;alengthV34V1IapathasV34V30FAainfix =apath_weightV35V30V31AapathasV35V30EaInfiniteainfix &gt;=alengthV37V1IapathasV37V36FIamemaTuple2V36V30aemptyFAainfix &gt;=alengthV38V1IapathasV38V30FIamemV30averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1378,10 +1378,10 @@
          </goal>
          <goal
           name="WP_parameter bellman_ford.17.1.4"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="186" loccnumb="6" loccnume="18"
           expl="loop invariant preservation"
-          sum="4b195898538ae7ad9689e3719a288aa6"
+          sum="95d257b3f1ea85a1171440b9b474121d"
           proved="true"
           expanded="true"
           shape="Camixfix []V4V6aFiniteVtaInfiniteainfix &gt;=alengthV8ainfix +V1c1IapathasV8V6FIamemV6averticesFICamixfix []V4V9aFiniteVainfix &gt;=ainfix +apath_weightV12V11aweightV11V9V10IamemaTuple2V11V9aedgesIainfix &lt;alengthV12V1IapathasV12V11FAainfix &gt;=apath_weightV13V9V10Iainfix &lt;alengthV13V1IapathasV13V9FAainfix =apath_weightV14V9V10AapathasV14V9EaInfiniteainfix &gt;=alengthV16V1IapathasV16V15FIamemaTuple2V15V9aedgesFAainfix &gt;=alengthV17V1IapathasV17V9FIamemV9averticesFIainfix =V5aTrueNNIamemV18V3NFqainfix =V5aTrueFICamixfix []V4V19aFiniteVainfix &gt;=ainfix +apath_weightV22V21aweightV21V19V20IamemaTuple2V21V19adiffaedgesV3Iainfix &lt;alengthV22V1IapathasV22V21FAainfix &gt;=apath_weightV23V19V20Iainfix &lt;alengthV23V1IapathasV23V19FAainfix =apath_weightV24V19V20AapathasV24V19EaInfiniteainfix &gt;=alengthV26V1IapathasV26V25FIamemaTuple2V25V19adiffaedgesV3FAainfix &gt;=alengthV27V1IapathasV27V19FIamemV19averticesFAamemV28aedgesIamemV28V3FFIainfix =V2aedgesFICamixfix []V0V29aFiniteVainfix &gt;=ainfix +apath_weightV32V31aweightV31V29V30IamemaTuple2V31V29aemptyIainfix &lt;alengthV32V1IapathasV32V31FAainfix &gt;=apath_weightV33V29V30Iainfix &lt;alengthV33V1IapathasV33V29FAainfix =apath_weightV34V29V30AapathasV34V29EaInfiniteainfix &gt;=alengthV36V1IapathasV36V35FIamemaTuple2V35V29aemptyFAainfix &gt;=alengthV37V1IapathasV37V29FIamemV29averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1394,15 +1394,15 @@
            edited="bf_WP_BellmanFord_WP_parameter_bellman_ford_18.v"
            obsolete="false"
            archived="false">
-           <result status="valid" time="10.07"/>
+           <result status="valid" time="8.19"/>
           </proof>
          </goal>
          <goal
           name="WP_parameter bellman_ford.17.1.5"
-          locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+          locfile="programs/bellman_ford/../bellman_ford.mlw"
           loclnum="186" loccnumb="6" loccnume="18"
           expl="loop invariant preservation"
-          sum="535dd03a33bce62ab8565dabf0bc1e4b"
+          sum="47e70fea13baac9f1f8c1ce291fa6ca7"
           proved="true"
           expanded="false"
           shape="Camixfix []V4V6aFiniteVtaInfiniteainfix &gt;=alengthV9ainfix +V1c1IapathasV9V8FIamemaTuple2V8V6aemptyFIamemV6averticesFICamixfix []V4V10aFiniteVainfix &gt;=ainfix +apath_weightV13V12aweightV12V10V11IamemaTuple2V12V10aedgesIainfix &lt;alengthV13V1IapathasV13V12FAainfix &gt;=apath_weightV14V10V11Iainfix &lt;alengthV14V1IapathasV14V10FAainfix =apath_weightV15V10V11AapathasV15V10EaInfiniteainfix &gt;=alengthV17V1IapathasV17V16FIamemaTuple2V16V10aedgesFAainfix &gt;=alengthV18V1IapathasV18V10FIamemV10averticesFIainfix =V5aTrueNNIamemV19V3NFqainfix =V5aTrueFICamixfix []V4V20aFiniteVainfix &gt;=ainfix +apath_weightV23V22aweightV22V20V21IamemaTuple2V22V20adiffaedgesV3Iainfix &lt;alengthV23V1IapathasV23V22FAainfix &gt;=apath_weightV24V20V21Iainfix &lt;alengthV24V1IapathasV24V20FAainfix =apath_weightV25V20V21AapathasV25V20EaInfiniteainfix &gt;=alengthV27V1IapathasV27V26FIamemaTuple2V26V20adiffaedgesV3FAainfix &gt;=alengthV28V1IapathasV28V20FIamemV20averticesFAamemV29aedgesIamemV29V3FFIainfix =V2aedgesFICamixfix []V0V30aFiniteVainfix &gt;=ainfix +apath_weightV33V32aweightV32V30V31IamemaTuple2V32V30aemptyIainfix &lt;alengthV33V1IapathasV33V32FAainfix &gt;=apath_weightV34V30V31Iainfix &lt;alengthV34V1IapathasV34V30FAainfix =apath_weightV35V30V31AapathasV35V30EaInfiniteainfix &gt;=alengthV37V1IapathasV37V36FIamemaTuple2V36V30aemptyFAainfix &gt;=alengthV38V1IapathasV38V30FIamemV30averticesFIainfix =V1ainfix -acardinalaverticesc1Oainfix &lt;V1ainfix -acardinalaverticesc1Aainfix =c1V1Oainfix &lt;c1V1FFIainfix =c1ainfix -acardinalaverticesc1Oainfix &lt;c1ainfix -acardinalaverticesc1">
@@ -1439,10 +1439,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.18"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="assertion"
-      sum="cfa3bd595e9dd427f148ae94c6eea12d"
+      sum="80b7cdf450af4b6ec422a2b24d292fbe"
       proved="true"
       expanded="true"
       shape="ainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1459,10 +1459,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.19"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop invariant init"
-      sum="f400bae09ef0e3e86eb0ab3206f04591"
+      sum="a7706cbce250a27791a57336b4c58c75"
       proved="true"
       expanded="true"
       shape="ainv2V0adiffaedgesV1AasubsetV1aedgesIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1479,10 +1479,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.20"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="precondition"
-      sum="5a3fe05f3a1c9cb0679d885d59627484"
+      sum="2867c57309638c9220682fea847a6d69"
       proved="true"
       expanded="true"
       shape="ais_emptyV2NIainfix =V3aTrueNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1499,10 +1499,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.21"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="exceptional postcondition"
-      sum="e49d7f4bbdf75b030be0455d4de50322"
+      sum="04ed4b48c97565c90de91fef3874b8db"
       proved="true"
       expanded="true"
       shape="anegative_cycleV8EICagetV0V5aInfinitefaFiniteVCagetV0V6aInfinitetaFiniteVainfix &lt;ainfix +V9aweightV5V6V10Iainfix =V4aremoveV7V2AamemV7V2LaTuple2V5V6FFIais_emptyV2NIainfix =V3aTrueNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1515,15 +1515,15 @@
        edited="bf_WP_BellmanFord_WP_parameter_bellman_ford_15.v"
        obsolete="false"
        archived="false">
-       <result status="valid" time="5.72"/>
+       <result status="valid" time="3.77"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter bellman_ford.22"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop invariant preservation"
-      sum="d239b62796b6176b8b0b1e06567f8cee"
+      sum="14a2ff44eeeb8b219426b0ae9f58ca6a"
       proved="true"
       expanded="true"
       shape="ainv2V0adiffaedgesV4AasubsetV4aedgesICagetV0V5aInfinitefaFiniteVCagetV0V6aInfinitetaFiniteVainfix &lt;ainfix +V8aweightV5V6V9NIainfix =V4aremoveV7V2AamemV7V2LaTuple2V5V6FFIais_emptyV2NIainfix =V3aTrueNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1535,10 +1535,10 @@
        expanded="true">
        <goal
         name="WP_parameter bellman_ford.22.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="parameter bellman_ford"
-        sum="470ba42c4c17961f6cbeba2a7111c90e"
+        sum="4081627f128e2c371b58b08e4e1acabe"
         proved="true"
         expanded="true"
         shape="asubsetV4aedgesICagetV0V5aInfinitefaFiniteVCagetV0V6aInfinitetaFiniteVainfix &lt;ainfix +V8aweightV5V6V9NIainfix =V4aremoveV7V2AamemV7V2LaTuple2V5V6FFIais_emptyV2NIainfix =V3aTrueNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1555,10 +1555,10 @@
        </goal>
        <goal
         name="WP_parameter bellman_ford.22.2"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="parameter bellman_ford"
-        sum="29666b03b6b4f10df1eb5647267e24f7"
+        sum="b220262ce142fcd2485424a722b5f7c5"
         proved="true"
         expanded="true"
         shape="ainv2V0adiffaedgesV4ICagetV0V5aInfinitefaFiniteVCagetV0V6aInfinitetaFiniteVainfix &lt;ainfix +V8aweightV5V6V9NIainfix =V4aremoveV7V2AamemV7V2LaTuple2V5V6FFIais_emptyV2NIainfix =V3aTrueNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1570,17 +1570,17 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="11.54"/>
+         <result status="valid" time="7.43"/>
         </proof>
        </goal>
       </transf>
      </goal>
      <goal
       name="WP_parameter bellman_ford.23"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="loop variant decrease"
-      sum="a277f592396b76698c3fc465079386fb"
+      sum="6b196c9b3a4e050953c5f61655f1471b"
       proved="true"
       expanded="true"
       shape="ainfix &lt;acardinalV4acardinalV2Aainfix &lt;=c0acardinalV2ICagetV0V5aInfinitefaFiniteVCagetV0V6aInfinitetaFiniteVainfix &lt;ainfix +V8aweightV5V6V9NIainfix =V4aremoveV7V2AamemV7V2LaTuple2V5V6FFIais_emptyV2NIainfix =V3aTrueNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1597,10 +1597,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.24"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="assertion"
-      sum="9399463cf67b5cd17934301f20875b8b"
+      sum="4a199eca5f4c92703d91c3280bde68ac"
       proved="true"
       expanded="true"
       shape="ainv2V0aedgesIainfix =V3aTrueNNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1617,10 +1617,10 @@
      </goal>
      <goal
       name="WP_parameter bellman_ford.25"
-      locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+      locfile="programs/bellman_ford/../bellman_ford.mlw"
       loclnum="186" loccnumb="6" loccnume="18"
       expl="postcondition"
-      sum="6157bd835ac0bf4ec108ed5186df50cb"
+      sum="afd7292076c0bb1fed19c8d5cbe11cc6"
       proved="true"
       expanded="true"
       shape="CagetV0V4aFiniteVainfix &gt;=apath_weightV6V4V5IapathasV6V4FAainfix =apath_weightV7V4V5AapathasV7V4EaInfiniteapathasV8V4NFIamemV4averticesFIainv2V0aedgesIainfix =V3aTrueNNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1632,10 +1632,10 @@
        expanded="true">
        <goal
         name="WP_parameter bellman_ford.25.1"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="postcondition"
-        sum="b01bcd168cab766df23e9cb5860b9206"
+        sum="7a4107cafd9193b47ffe1276bafd9620"
         proved="true"
         expanded="true"
         shape="CagetV0V4aFiniteVainfix =apath_weightV6V4V5AapathasV6V4EaInfinitetIamemV4averticesFIainv2V0aedgesIainfix =V3aTrueNNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1668,10 +1668,10 @@
        </goal>
        <goal
         name="WP_parameter bellman_ford.25.2"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="postcondition"
-        sum="26d56039a208b6b4fb9a4b2e14493810"
+        sum="1886fa0b373b59e44ab0430b6bcca93a"
         proved="true"
         expanded="true"
         shape="CagetV0V4aFiniteVainfix &gt;=apath_weightV6V4V5IapathasV6V4FaInfinitetIamemV4averticesFIainv2V0aedgesIainfix =V3aTrueNNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
@@ -1689,10 +1689,10 @@
        </goal>
        <goal
         name="WP_parameter bellman_ford.25.3"
-        locfile="examples/programs/bellman_ford/../bellman_ford.mlw"
+        locfile="programs/bellman_ford/../bellman_ford.mlw"
         loclnum="186" loccnumb="6" loccnume="18"
         expl="postcondition"
-        sum="3a2a4a3051a3877b9c37cb609f521bbb"
+        sum="fa945991e7c7576e91cb4b3715a48887"
         proved="true"
         expanded="true"
         shape="CagetV0V4aFiniteVtaInfiniteapathasV6V4NFIamemV4averticesFIainv2V0aedgesIainfix =V3aTrueNNIais_emptyV2qainfix =V3aTrueFIainv2V0adiffaedgesV2AasubsetV2aedgesFIainfix =V1aedgesFIainv1V0acardinalaverticesaemptyIainv1V0ainfix +ainfix -acardinalaverticesc1c1aemptyFIainfix &lt;=c1ainfix -acardinalaverticesc1">
diff --git a/examples/programs/generate_all_trees/why3session.xml b/examples/programs/generate_all_trees/why3session.xml
index e574e78b07536228293ca0253c80ad4737dfbe7d..f46debdd131e73d0d43ab84a2d54e5b8dbbbdf75 100644
--- a/examples/programs/generate_all_trees/why3session.xml
+++ b/examples/programs/generate_all_trees/why3session.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
- name="examples/programs/generate_all_trees/why3session.xml" shape_version="2">
+ name="programs/generate_all_trees/why3session.xml" shape_version="2">
  <prover
   id="0"
   name="Alt-Ergo"
@@ -44,13 +44,13 @@
   expanded="true">
   <theory
    name="GenerateAllTrees"
-   locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+   locfile="programs/generate_all_trees/../generate_all_trees.mlw"
    loclnum="11" loccnumb="7" loccnume="23"
    verified="true"
    expanded="true">
    <goal
     name="size_nonneg"
-    locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+    locfile="programs/generate_all_trees/../generate_all_trees.mlw"
     loclnum="28" loccnumb="8" loccnume="19"
     sum="325bafa76ea374191369e3e62dac092f"
     proved="true"
@@ -68,7 +68,7 @@
    </goal>
    <goal
     name="size_left"
-    locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+    locfile="programs/generate_all_trees/../generate_all_trees.mlw"
     loclnum="30" loccnumb="8" loccnume="17"
     sum="8930102433a8a6f56c13f6f8bce4c64d"
     proved="true"
@@ -85,7 +85,7 @@
    </goal>
    <goal
     name="all_trees_0"
-    locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+    locfile="programs/generate_all_trees/../generate_all_trees.mlw"
     loclnum="38" loccnumb="8" loccnume="19"
     sum="4fbcece4de389c580b2a3e038bbd85ea"
     proved="true"
@@ -103,7 +103,7 @@
    </goal>
    <goal
     name="tree_diff"
-    locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+    locfile="programs/generate_all_trees/../generate_all_trees.mlw"
     loclnum="40" loccnumb="8" loccnume="17"
     sum="dd3330003995451ea746a663bb7bc27c"
     proved="true"
@@ -120,13 +120,13 @@
    </goal>
    <goal
     name="WP_parameter combine"
-    locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+    locfile="programs/generate_all_trees/../generate_all_trees.mlw"
     loclnum="46" loccnumb="6" loccnume="13"
     expl="parameter combine"
-    sum="aad865b8012ecab032dd22030f8e44c6"
+    sum="b38b12461f25650b6f96a126ea226cc1"
     proved="true"
     expanded="true"
-    shape="ainfix =asizeV7V2Aainfix =asizeV6V0Aainfix =V5aNodeV6V7EqamemV5V4FAadistinctV4IamemV10V3AamemV9V1Aainfix =V8aNodeV9V10EqamemV8V4FAadistinctV4FAadistinctV1ACV11aNilamemV14V3AamemV13V11Aainfix =V12aNodeV13V14EqamemV12aNilFAadistinctaNilaConsVVamemV21V3AamemV20V11Aainfix =V19aNodeV20V21EqamemV19ainfix ++V18V17FAadistinctainfix ++V18V17IamemV23V3Aainfix =V22aNodeV15V23EqamemV22V18FAadistinctV18FAadistinctV3IamemV26V3AamemV25V16Aainfix =V24aNodeV25V26EqamemV24V17FAadistinctV17FAadistinctV16Aainfix &lt;alengthV16alengthV11Aainfix &lt;=c0alengthV11ACV27aNilamemV29V27Aainfix =V28aNodeV15V29EqamemV28aNilFAadistinctaNilaConsVVamemV34V27Aainfix =V33aNodeV15V34EqamemV33aConsaNodeV15V30V32FAadistinctaConsaNodeV15V30V32IamemV36V31Aainfix =V35aNodeV15V36EqamemV35V32FAadistinctV32FAadistinctV31Aainfix &lt;alengthV31alengthV27Aainfix &lt;=c0alengthV27IadistinctV27FIadistinctV11FIaall_treesV2V3Aainfix &lt;=c0V2Aaall_treesV0V1Aainfix &lt;=c0V0F">
+    shape="ainfix =asizeV7V2Aainfix =asizeV6V0Aainfix =V5aNodeV6V7EqamemV5V4FAadistinctV4IamemV10V3AamemV9V1Aainfix =V8aNodeV9V10EqamemV8V4FAadistinctV4FAadistinctV1ACV11aNilamemV14V3AamemV13V11Aainfix =V12aNodeV13V14EqamemV12aNilFAadistinctaNilaConsVVamemV21V3AamemV20V11Aainfix =V19aNodeV20V21EqamemV19ainfix ++V18V17FAadistinctainfix ++V18V17IamemV23V3Aainfix =V22aNodeV15V23EqamemV22V18FAadistinctV18FAadistinctV3IamemV26V3AamemV25V16Aainfix =V24aNodeV25V26EqamemV24V17FAadistinctV17FAadistinctV16ACV11aNilfaConswVainfix =V27V16ACV28aNilamemV30V28Aainfix =V29aNodeV15V30EqamemV29aNilFAadistinctaNilaConsVVamemV35V28Aainfix =V34aNodeV15V35EqamemV34aConsaNodeV15V31V33FAadistinctaConsaNodeV15V31V33IamemV37V32Aainfix =V36aNodeV15V37EqamemV36V33FAadistinctV33FAadistinctV32ACV28aNilfaConswVainfix =V38V32IadistinctV28FIadistinctV11FIaall_treesV2V3Aainfix &lt;=c0V2Aaall_treesV0V1Aainfix &lt;=c0V0F">
     <label
      name="expl:parameter combine"/>
     <transf
@@ -135,7 +135,7 @@
      expanded="true">
      <goal
       name="WP_parameter combine.1"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="76df7c688b612389d685209a345cbdbd"
@@ -155,7 +155,7 @@
      </goal>
      <goal
       name="WP_parameter combine.2"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="589d76adfe49bc75a0dc6eaf5ad83a1b"
@@ -175,7 +175,7 @@
      </goal>
      <goal
       name="WP_parameter combine.3"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="e1d578ff891035300e3efe3bf0dcaf52"
@@ -195,7 +195,7 @@
      </goal>
      <goal
       name="WP_parameter combine.4"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="f525ead4e24ae4984a77cffd298746d0"
@@ -215,13 +215,13 @@
      </goal>
      <goal
       name="WP_parameter combine.5"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="variant decrease"
-      sum="f0f1b40db122c711f75044e8410810ef"
+      sum="8f17066f7c3f5c03b81add8c2d873a2b"
       proved="true"
       expanded="true"
-      shape="CV4aNiltaConsVVCV7aNiltaConsVVainfix &lt;alengthV9alengthV7Aainfix &lt;=c0alengthV7IadistinctV7FIadistinctV4FIaall_treesV2V3Aainfix &lt;=c0V2Aaall_treesV0V1Aainfix &lt;=c0V0F">
+      shape="CV4aNiltaConsVVCV7aNiltaConsVVCV7aNilfaConswVainfix =V10V9IadistinctV7FIadistinctV4FIaall_treesV2V3Aainfix &lt;=c0V2Aaall_treesV0V1Aainfix &lt;=c0V0F">
       <label
        name="expl:parameter combine"/>
       <proof
@@ -235,7 +235,7 @@
      </goal>
      <goal
       name="WP_parameter combine.6"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="precondition"
       sum="633d9c22d79c49f1080d73ac4bd14805"
@@ -255,7 +255,7 @@
      </goal>
      <goal
       name="WP_parameter combine.7"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="914b294082b211539478defd5149bdcb"
@@ -281,25 +281,25 @@
        <result status="valid" time="1.61"/>
       </proof>
       <proof
-       prover="8"
+       prover="7"
        timelimit="5"
        memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="timeout" time="5.05"/>
+       <result status="timeout" time="5.07"/>
       </proof>
       <proof
-       prover="7"
+       prover="8"
        timelimit="5"
        memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="timeout" time="5.07"/>
+       <result status="timeout" time="5.05"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter combine.8"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="5d4ba5304ed53bc8aab0f7f62a936415"
@@ -314,7 +314,7 @@
        expanded="true">
        <goal
         name="WP_parameter combine.8.1"
-        locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+        locfile="programs/generate_all_trees/../generate_all_trees.mlw"
         loclnum="46" loccnumb="6" loccnume="13"
         expl="postcondition"
         sum="33ecbcf766017937c66c6eb4a3236fee"
@@ -323,14 +323,6 @@
         shape="CV4aNiltaConsVVCV7aNiltaConsVVamemV12V7Aainfix =V11aNodeV5V12EIamemV11aConsaNodeV5V8V10FIamemV14V9Aainfix =V13aNodeV5V14EqamemV13V10FAadistinctV10FIadistinctV9IadistinctV7FIadistinctV4FIaall_treesV2V3Aainfix &lt;=c0V2Aaall_treesV0V1Aainfix &lt;=c0V0F">
         <label
          name="expl:parameter combine"/>
-        <proof
-         prover="5"
-         timelimit="5"
-         memlimit="1000"
-         obsolete="false"
-         archived="false">
-         <result status="valid" time="0.22"/>
-        </proof>
         <proof
          prover="3"
          timelimit="10"
@@ -348,10 +340,18 @@
          archived="false">
          <result status="valid" time="0.16"/>
         </proof>
+        <proof
+         prover="5"
+         timelimit="5"
+         memlimit="1000"
+         obsolete="false"
+         archived="false">
+         <result status="valid" time="0.22"/>
+        </proof>
        </goal>
        <goal
         name="WP_parameter combine.8.2"
-        locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+        locfile="programs/generate_all_trees/../generate_all_trees.mlw"
         loclnum="46" loccnumb="6" loccnume="13"
         expl="postcondition"
         sum="05acad704a834a0bde7206b43a8f1c64"
@@ -373,13 +373,13 @@
      </goal>
      <goal
       name="WP_parameter combine.9"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="variant decrease"
-      sum="5981d0cb6264e967745bd651e38378fe"
+      sum="4b42251f943b486876030ec134718785"
       proved="true"
       expanded="true"
-      shape="CV4aNiltaConsVVainfix &lt;alengthV6alengthV4Aainfix &lt;=c0alengthV4IadistinctV4FIaall_treesV2V3Aainfix &lt;=c0V2Aaall_treesV0V1Aainfix &lt;=c0V0F">
+      shape="CV4aNiltaConsVVCV4aNilfaConswVainfix =V7V6IadistinctV4FIaall_treesV2V3Aainfix &lt;=c0V2Aaall_treesV0V1Aainfix &lt;=c0V0F">
       <label
        name="expl:parameter combine"/>
       <proof
@@ -393,7 +393,7 @@
      </goal>
      <goal
       name="WP_parameter combine.10"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="precondition"
       sum="feadc5edb39c4aac73998c80e6014704"
@@ -413,7 +413,7 @@
      </goal>
      <goal
       name="WP_parameter combine.11"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="precondition"
       sum="ddb89a533b5deb9955b6edff5a4b5ff2"
@@ -433,7 +433,7 @@
      </goal>
      <goal
       name="WP_parameter combine.12"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="fa591f29254e41d7a58b0a55b387f2ea"
@@ -453,7 +453,7 @@
      </goal>
      <goal
       name="WP_parameter combine.13"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="879b88cf547ed50e38db2b5fbc2df3d9"
@@ -468,7 +468,7 @@
        expanded="true">
        <goal
         name="WP_parameter combine.13.1"
-        locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+        locfile="programs/generate_all_trees/../generate_all_trees.mlw"
         loclnum="46" loccnumb="6" loccnume="13"
         expl="postcondition"
         sum="8309451cffe31089624cfaa11e3e82b6"
@@ -488,7 +488,7 @@
        </goal>
        <goal
         name="WP_parameter combine.13.2"
-        locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+        locfile="programs/generate_all_trees/../generate_all_trees.mlw"
         loclnum="46" loccnumb="6" loccnume="13"
         expl="postcondition"
         sum="4445741e24f8a4a2c350b738dfb60968"
@@ -510,7 +510,7 @@
      </goal>
      <goal
       name="WP_parameter combine.14"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="precondition"
       sum="09fd178cd9149d680ccb706cd36464b8"
@@ -530,7 +530,7 @@
      </goal>
      <goal
       name="WP_parameter combine.15"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="152ca81b2c5a7a36352e5aa977c40dde"
@@ -550,7 +550,7 @@
      </goal>
      <goal
       name="WP_parameter combine.16"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="46" loccnumb="6" loccnume="13"
       expl="postcondition"
       sum="a33b598a9e01999e23a9221943202283"
@@ -565,7 +565,7 @@
        expanded="true">
        <goal
         name="WP_parameter combine.16.1"
-        locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+        locfile="programs/generate_all_trees/../generate_all_trees.mlw"
         loclnum="46" loccnumb="6" loccnume="13"
         expl="postcondition"
         sum="d5b033af15f8148c1e0383d856009832"
@@ -585,7 +585,7 @@
        </goal>
        <goal
         name="WP_parameter combine.16.2"
-        locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+        locfile="programs/generate_all_trees/../generate_all_trees.mlw"
         loclnum="46" loccnumb="6" loccnume="13"
         expl="postcondition"
         sum="5eff00417641a755fcfa38fc9e709b44"
@@ -609,7 +609,7 @@
    </goal>
    <goal
     name="WP_parameter all_trees"
-    locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+    locfile="programs/generate_all_trees/../generate_all_trees.mlw"
     loclnum="74" loccnumb="6" loccnume="15"
     expl="parameter all_trees"
     sum="5812d56f7583befb9f55ca6e5d212a9e"
@@ -624,7 +624,7 @@
      expanded="true">
      <goal
       name="WP_parameter all_trees.1"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="precondition"
       sum="810df2c60cf1ab6ddecf2050fbb37b98"
@@ -644,7 +644,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.2"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="precondition"
       sum="863fc90db7ae0da6c0987f3f74dfeab2"
@@ -664,7 +664,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.3"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="postcondition"
       sum="a5f7128a9ceaa2783a0682a47e427543"
@@ -684,7 +684,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.4"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="loop invariant init"
       sum="517afc58aded2110ea451814507073c2"
@@ -704,7 +704,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.5"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="precondition"
       sum="041140c4ad2b4aa172d7f040321166b5"
@@ -724,7 +724,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.6"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="loop invariant preservation"
       sum="b1fd23c0df4d0e28fc2c14d900c4d9bd"
@@ -744,7 +744,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.7"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="loop invariant init"
       sum="bcaad92e21fdb75767518d2af379b718"
@@ -764,7 +764,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.8"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="loop invariant init"
       sum="10f9a0b148e5c03252cdaa625eb42fc0"
@@ -784,7 +784,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.9"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="loop invariant init"
       sum="15d0ed0b23679d13a4a4496e20a46d65"
@@ -804,7 +804,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.10"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="precondition"
       sum="3a016ec336bfc056415a6d8fcbd5b5b4"
@@ -824,7 +824,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.11"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="precondition"
       sum="1d3e051d04d0af920fa62a1c9abef8a4"
@@ -844,7 +844,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.12"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="precondition"
       sum="81b1645b3edea942a63b9142cd8d2f7c"
@@ -864,7 +864,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.13"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="precondition"
       sum="392d476cee5470c3bf69b3b9c93606e9"
@@ -884,7 +884,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.14"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="precondition"
       sum="49f2a58fec1a6ce5efffc058d47aac07"
@@ -904,7 +904,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.15"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="loop invariant preservation"
       sum="25ae91af5b01e0fc9adb3c01abecd592"
@@ -924,7 +924,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.16"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="loop invariant preservation"
       sum="e49be243222bd571d4b8dab6f6442387"
@@ -944,7 +944,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.17"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="loop invariant preservation"
       sum="8534177db7ac862b0e3c3738ce87874d"
@@ -959,7 +959,7 @@
        expanded="true">
        <goal
         name="WP_parameter all_trees.17.1"
-        locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+        locfile="programs/generate_all_trees/../generate_all_trees.mlw"
         loclnum="74" loccnumb="6" loccnume="15"
         expl="loop invariant preservation"
         sum="8b90ab6846b5e0adb2fec36f37f50fe6"
@@ -987,7 +987,7 @@
        </goal>
        <goal
         name="WP_parameter all_trees.17.2"
-        locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+        locfile="programs/generate_all_trees/../generate_all_trees.mlw"
         loclnum="74" loccnumb="6" loccnume="15"
         expl="loop invariant preservation"
         sum="1c25113106f3169b012a914652e8492b"
@@ -1009,7 +1009,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.18"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="loop invariant preservation"
       sum="e4dee6346f7ea4e833518d9b6b90b11d"
@@ -1029,7 +1029,7 @@
      </goal>
      <goal
       name="WP_parameter all_trees.19"
-      locfile="examples/programs/generate_all_trees/../generate_all_trees.mlw"
+      locfile="programs/generate_all_trees/../generate_all_trees.mlw"
       loclnum="74" loccnumb="6" loccnume="15"
       expl="postcondition"
       sum="d843ba00a046c33e2faa9288fb7cfc78"
diff --git a/examples/programs/insertion_sort_list/why3session.xml b/examples/programs/insertion_sort_list/why3session.xml
index 6b2774b361873e1db90f66e7166b127d705d9af3..b8914d15b540aed04a25b28d68ab45fe94ee7fe9 100644
--- a/examples/programs/insertion_sort_list/why3session.xml
+++ b/examples/programs/insertion_sort_list/why3session.xml
@@ -28,11 +28,11 @@
     name="WP_parameter insert"
     locfile="programs/insertion_sort_list/../insertion_sort_list.mlw"
     loclnum="11" loccnumb="10" loccnume="16"
-    expl="normal postcondition"
-    sum="50d27999e9260510364622fcfe7de7bc"
+    expl="parameter insert"
+    sum="8c949dfa217f9bcbbeab182e92a6bbe4"
     proved="true"
     expanded="true"
-    shape="CV1aNilapermutaConsV0V1aConsV0aNilAasortedaConsV0aNilaConsVViainfix &lt;=V0V2apermutaConsV0V1aConsV0V1AasortedaConsV0V1apermutaConsV0V1aConsV2V4AasortedaConsV2V4IapermutaConsV0V3V4AasortedV4FAasortedV3Aainfix &lt;alengthV3alengthV1Aainfix &lt;=c0alengthV1IasortedV1F">
+    shape="CV1aNilapermutaConsV0V1aConsV0aNilAasortedaConsV0aNilaConsVViainfix &lt;=V0V2apermutaConsV0V1aConsV0V1AasortedaConsV0V1apermutaConsV0V1aConsV2V4AasortedaConsV2V4IapermutaConsV0V3V4AasortedV4FAasortedV3ACV1aNilfaConswVainfix =V5V3IasortedV1F">
     <label
      name="expl:parameter insert"/>
     <transf
@@ -43,7 +43,7 @@
       name="WP_parameter insert.1"
       locfile="programs/insertion_sort_list/../insertion_sort_list.mlw"
       loclnum="11" loccnumb="10" loccnume="16"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="3c3f20287b2598f197dffcab0c1b4e01"
       proved="true"
       expanded="true"
@@ -63,7 +63,7 @@
       name="WP_parameter insert.2"
       locfile="programs/insertion_sort_list/../insertion_sort_list.mlw"
       loclnum="11" loccnumb="10" loccnume="16"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="bef425ce04e590572c7731091c1e1f5a"
       proved="true"
       expanded="true"
@@ -83,11 +83,11 @@
       name="WP_parameter insert.3"
       locfile="programs/insertion_sort_list/../insertion_sort_list.mlw"
       loclnum="11" loccnumb="10" loccnume="16"
-      expl="variant decreases"
-      sum="305f79d325fe748a40f4ef3ca8fe537b"
+      expl="variant decrease"
+      sum="07c671597521e1e3e21b3cfacd432576"
       proved="true"
       expanded="true"
-      shape="CV1aNiltaConsVVainfix &lt;alengthV3alengthV1Aainfix &lt;=c0alengthV1Iainfix &lt;=V0V2NIasortedV1F">
+      shape="CV1aNiltaConsVVCV1aNilfaConswVainfix =V4V3Iainfix &lt;=V0V2NIasortedV1F">
       <label
        name="expl:parameter insert"/>
       <proof
@@ -131,7 +131,7 @@
       name="WP_parameter insert.5"
       locfile="programs/insertion_sort_list/../insertion_sort_list.mlw"
       loclnum="11" loccnumb="10" loccnume="16"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="bfe71c11e2fd453b82fffaa40b2f8661"
       proved="true"
       expanded="true"
@@ -153,11 +153,11 @@
     name="WP_parameter insertion_sort"
     locfile="programs/insertion_sort_list/../insertion_sort_list.mlw"
     loclnum="19" loccnumb="10" loccnume="24"
-    expl="normal postcondition"
-    sum="91e7a417bbda5e6e7a25fbb0ce7c9d75"
+    expl="parameter insertion_sort"
+    sum="d8acc8a2d5e27f9daac8d71bd50a82bc"
     proved="true"
     expanded="true"
-    shape="CV0aNilapermutV0aNilAasortedaNilaConsVVapermutV0V4AasortedV4IapermutaConsV1V3V4AasortedV4FAasortedV3IapermutV2V3AasortedV3FAainfix &lt;alengthV2alengthV0Aainfix &lt;=c0alengthV0F">
+    shape="CV0aNilapermutV0aNilAasortedaNilaConsVVapermutV0V4AasortedV4IapermutaConsV1V3V4AasortedV4FAasortedV3IapermutV2V3AasortedV3FACV0aNilfaConswVainfix =V5V2F">
     <label
      name="expl:parameter insertion_sort"/>
     <transf
@@ -168,7 +168,7 @@
       name="WP_parameter insertion_sort.1"
       locfile="programs/insertion_sort_list/../insertion_sort_list.mlw"
       loclnum="19" loccnumb="10" loccnume="24"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="10fffeed3eae8b2ec39b461fcad338e3"
       proved="true"
       expanded="true"
@@ -188,28 +188,28 @@
       name="WP_parameter insertion_sort.2"
       locfile="programs/insertion_sort_list/../insertion_sort_list.mlw"
       loclnum="19" loccnumb="10" loccnume="24"
-      expl="variant decreases"
-      sum="585ace7cdfac142a9315ac496ca56dcd"
+      expl="variant decrease"
+      sum="be1acf2d059d38b4f026fcf1e9e940ef"
       proved="true"
       expanded="true"
-      shape="CV0aNiltaConsVVainfix &lt;alengthV2alengthV0Aainfix &lt;=c0alengthV0F">
+      shape="CV0aNiltaConsVVCV0aNilfaConswVainfix =V3V2F">
       <label
        name="expl:parameter insertion_sort"/>
       <proof
-       prover="1"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.02"/>
       </proof>
       <proof
-       prover="0"
+       prover="1"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.02"/>
+       <result status="valid" time="0.01"/>
       </proof>
      </goal>
      <goal
@@ -224,7 +224,7 @@
       <label
        name="expl:parameter insertion_sort"/>
       <proof
-       prover="1"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
@@ -232,7 +232,7 @@
        <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="0"
+       prover="1"
        timelimit="10"
        memlimit="0"
        obsolete="false"
@@ -244,7 +244,7 @@
       name="WP_parameter insertion_sort.4"
       locfile="programs/insertion_sort_list/../insertion_sort_list.mlw"
       loclnum="19" loccnumb="10" loccnume="24"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="51cc212a15945c2aec5b681db1cbf378"
       proved="true"
       expanded="true"
@@ -252,20 +252,20 @@
       <label
        name="expl:parameter insertion_sort"/>
       <proof
-       prover="1"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.07"/>
+       <result status="valid" time="0.10"/>
       </proof>
       <proof
-       prover="0"
+       prover="1"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.10"/>
+       <result status="valid" time="0.07"/>
       </proof>
      </goal>
     </transf>
diff --git a/examples/programs/max_matrix/why3session.xml b/examples/programs/max_matrix/why3session.xml
index 3da7c54ca7f3affff126488e6102fa420326af87..d713b2ac4bf607e4d2e5b78215bdce07d05c1b9e 100644
--- a/examples/programs/max_matrix/why3session.xml
+++ b/examples/programs/max_matrix/why3session.xml
@@ -37,13 +37,13 @@
   <theory
    name="MaxMatrixMemo"
    locfile="examples/programs/max_matrix/../max_matrix.mlw"
-   loclnum="95" loccnumb="7" loccnume="20"
+   loclnum="91" loccnumb="7" loccnume="20"
    verified="true"
    expanded="true">
    <goal
     name="sum_ind"
     locfile="examples/programs/max_matrix/../max_matrix.mlw"
-    loclnum="121" loccnumb="8" loccnume="15"
+    loclnum="117" loccnumb="8" loccnume="15"
     sum="69c72d99f3649201d3ab4cdee426ef21"
     proved="true"
     expanded="false"
@@ -60,7 +60,7 @@
    <goal
     name="WP_parameter maximum"
     locfile="examples/programs/max_matrix/../max_matrix.mlw"
-    loclnum="152" loccnumb="10" loccnume="17"
+    loclnum="148" loccnumb="10" loccnume="17"
     expl="parameter maximum"
     sum="ecf2af1bf01bdbb98382e2c7e98a69d3"
     proved="true"
@@ -75,7 +75,7 @@
      <goal
       name="WP_parameter maximum.1"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="postcondition"
       sum="56b66ee2a25d31e48f7bce7d0b9d0cc0"
       proved="true"
@@ -95,7 +95,7 @@
      <goal
       name="WP_parameter maximum.2"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="assertion"
       sum="abf9dda3a744f57ef598816cb209775e"
       proved="true"
@@ -115,7 +115,7 @@
      <goal
       name="WP_parameter maximum.3"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="postcondition"
       sum="489cf004a4e5f0cf8aae5f59b20e9da1"
       proved="true"
@@ -135,7 +135,7 @@
      <goal
       name="WP_parameter maximum.4"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="loop invariant init"
       sum="7c094a73ee051288d36eab1b0bb0f906"
       proved="true"
@@ -155,7 +155,7 @@
      <goal
       name="WP_parameter maximum.5"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="variant decrease"
       sum="85d9b959edb9589c166feb6b8dd7db96"
       proved="true"
@@ -175,7 +175,7 @@
      <goal
       name="WP_parameter maximum.6"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="precondition"
       sum="7f9f2fb175b57c7624c66c5cd45125ef"
       proved="true"
@@ -195,7 +195,7 @@
      <goal
       name="WP_parameter maximum.7"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="loop invariant preservation"
       sum="cad1dd3ce042f8c1d707e3911e14d6e2"
       proved="true"
@@ -208,9 +208,9 @@
        proved="true"
        expanded="true">
        <goal
-        name="WP_parameter maximum.7.0"
+        name="WP_parameter maximum.7.1"
         locfile="examples/programs/max_matrix/../max_matrix.mlw"
-        loclnum="152" loccnumb="10" loccnume="17"
+        loclnum="148" loccnumb="10" loccnume="17"
         expl="parameter maximum"
         sum="da765b166bf9968c4421e1368b2ebd95"
         proved="true"
@@ -228,9 +228,9 @@
         </proof>
        </goal>
        <goal
-        name="WP_parameter maximum.7.1"
+        name="WP_parameter maximum.7.2"
         locfile="examples/programs/max_matrix/../max_matrix.mlw"
-        loclnum="152" loccnumb="10" loccnume="17"
+        loclnum="148" loccnumb="10" loccnume="17"
         expl="parameter maximum"
         sum="70eb65f9c41f2945725662233fbe1838"
         proved="true"
@@ -252,7 +252,7 @@
      <goal
       name="WP_parameter maximum.8"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="loop invariant preservation"
       sum="8294b753779a47fcc18222249a89d9ec"
       proved="true"
@@ -272,7 +272,7 @@
      <goal
       name="WP_parameter maximum.9"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="loop invariant preservation"
       sum="db65632644fd799b73e3e58188c5f844"
       proved="true"
@@ -292,7 +292,7 @@
      <goal
       name="WP_parameter maximum.10"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="assertion"
       sum="f5cb97e2dbb26c337844af2d30708524"
       proved="true"
@@ -312,7 +312,7 @@
      <goal
       name="WP_parameter maximum.11"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="152" loccnumb="10" loccnume="17"
+      loclnum="148" loccnumb="10" loccnume="17"
       expl="postcondition"
       sum="4d3c44b6ed86be609221d2862ef92eb4"
       proved="true"
@@ -334,7 +334,7 @@
    <goal
     name="WP_parameter memo"
     locfile="examples/programs/max_matrix/../max_matrix.mlw"
-    loclnum="181" loccnumb="7" loccnume="11"
+    loclnum="177" loccnumb="7" loccnume="11"
     expl="parameter memo"
     sum="eabaa55604f19692aeef494e233e79db"
     proved="true"
@@ -349,7 +349,7 @@
      <goal
       name="WP_parameter memo.1"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="181" loccnumb="7" loccnume="11"
+      loclnum="177" loccnumb="7" loccnume="11"
       expl="postcondition"
       sum="8bac43237535499ad3e04d6daf5354cb"
       proved="true"
@@ -364,7 +364,7 @@
        <goal
         name="WP_parameter memo.1.1"
         locfile="examples/programs/max_matrix/../max_matrix.mlw"
-        loclnum="181" loccnumb="7" loccnume="11"
+        loclnum="177" loccnumb="7" loccnume="11"
         expl="parameter memo"
         sum="fdd348dfd749be5f87c6eaf3bdd80fcb"
         proved="true"
@@ -384,7 +384,7 @@
        <goal
         name="WP_parameter memo.1.2"
         locfile="examples/programs/max_matrix/../max_matrix.mlw"
-        loclnum="181" loccnumb="7" loccnume="11"
+        loclnum="177" loccnumb="7" loccnume="11"
         expl="parameter memo"
         sum="78bf166701483a8fcbeb125cfbb50e3f"
         proved="true"
@@ -406,7 +406,7 @@
      <goal
       name="WP_parameter memo.2"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="181" loccnumb="7" loccnume="11"
+      loclnum="177" loccnumb="7" loccnume="11"
       expl="variant decrease"
       sum="24703a7c542893286e1717482cc4349b"
       proved="true"
@@ -442,7 +442,7 @@
      <goal
       name="WP_parameter memo.3"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="181" loccnumb="7" loccnume="11"
+      loclnum="177" loccnumb="7" loccnume="11"
       expl="precondition"
       sum="607dab200482644a0b8bdb6636e2a8b1"
       proved="true"
@@ -462,7 +462,7 @@
      <goal
       name="WP_parameter memo.4"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="181" loccnumb="7" loccnume="11"
+      loclnum="177" loccnumb="7" loccnume="11"
       expl="postcondition"
       sum="0aecd34a15544ec2196f2337c28a7c8e"
       proved="true"
@@ -484,22 +484,22 @@
    <goal
     name="WP_parameter maxmat"
     locfile="examples/programs/max_matrix/../max_matrix.mlw"
-    loclnum="187" loccnumb="6" loccnume="12"
+    loclnum="183" loccnumb="6" loccnume="12"
     expl="parameter maxmat"
     sum="d51970a5fd3ef3f253d3a28afb5caea9"
     proved="true"
-    expanded="false"
+    expanded="true"
     shape="ainfix &gt;=V3asumV5c0anIapermutationV5FAainfix =V3asumV6c0anAapermutationV6EIainvamk tV2AapostaTuple2c0abelowanaTuple2V3V4FFAainvV1AapreaTuple2c0abelowanAainvV1Iainfix =agetV0aTuple2V7V8aNoneFLamk tV0F">
     <label
      name="expl:parameter maxmat"/>
     <transf
      name="split_goal"
      proved="true"
-     expanded="false">
+     expanded="true">
      <goal
       name="WP_parameter maxmat.1"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="187" loccnumb="6" loccnume="12"
+      loclnum="183" loccnumb="6" loccnume="12"
       expl="assertion"
       sum="e6b11b2d1e60f0b1c4d50ce545098bb7"
       proved="true"
@@ -514,7 +514,7 @@
        <goal
         name="WP_parameter maxmat.1.1"
         locfile="examples/programs/max_matrix/../max_matrix.mlw"
-        loclnum="187" loccnumb="6" loccnume="12"
+        loclnum="183" loccnumb="6" loccnume="12"
         expl="assertion"
         sum="eed8f3e4f4a53139af28a78770d80a99"
         proved="true"
@@ -536,7 +536,7 @@
      <goal
       name="WP_parameter maxmat.2"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="187" loccnumb="6" loccnume="12"
+      loclnum="183" loccnumb="6" loccnume="12"
       expl="precondition"
       sum="e5cf1057a0c9c69500b39daaec4099bd"
       proved="true"
@@ -551,7 +551,7 @@
        <goal
         name="WP_parameter maxmat.2.1"
         locfile="examples/programs/max_matrix/../max_matrix.mlw"
-        loclnum="187" loccnumb="6" loccnume="12"
+        loclnum="183" loccnumb="6" loccnume="12"
         expl="precondition"
         sum="54f6954959e7694de9f07894cbd7aea4"
         proved="true"
@@ -566,7 +566,7 @@
          <goal
           name="WP_parameter maxmat.2.1.1"
           locfile="examples/programs/max_matrix/../max_matrix.mlw"
-          loclnum="187" loccnumb="6" loccnume="12"
+          loclnum="183" loccnumb="6" loccnume="12"
           expl="parameter maxmat"
           sum="3a5cf8f02f131ce82658c2f28d81dfe7"
           proved="true"
@@ -586,7 +586,7 @@
          <goal
           name="WP_parameter maxmat.2.1.2"
           locfile="examples/programs/max_matrix/../max_matrix.mlw"
-          loclnum="187" loccnumb="6" loccnume="12"
+          loclnum="183" loccnumb="6" loccnume="12"
           expl="parameter maxmat"
           sum="f29d588196c6d1122ce2e0e4739171e3"
           proved="true"
@@ -606,7 +606,7 @@
          <goal
           name="WP_parameter maxmat.2.1.3"
           locfile="examples/programs/max_matrix/../max_matrix.mlw"
-          loclnum="187" loccnumb="6" loccnume="12"
+          loclnum="183" loccnumb="6" loccnume="12"
           expl="parameter maxmat"
           sum="96a3f5d206f0c49b54bc8d0afcdcc79d"
           proved="true"
@@ -626,7 +626,7 @@
          <goal
           name="WP_parameter maxmat.2.1.4"
           locfile="examples/programs/max_matrix/../max_matrix.mlw"
-          loclnum="187" loccnumb="6" loccnume="12"
+          loclnum="183" loccnumb="6" loccnume="12"
           expl="parameter maxmat"
           sum="c2787cf0c93f7e3e72c45da09a14f635"
           proved="true"
@@ -646,7 +646,7 @@
          <goal
           name="WP_parameter maxmat.2.1.5"
           locfile="examples/programs/max_matrix/../max_matrix.mlw"
-          loclnum="187" loccnumb="6" loccnume="12"
+          loclnum="183" loccnumb="6" loccnume="12"
           expl="parameter maxmat"
           sum="2ce18ec7a5894976cf2a23c1abfb4300"
           proved="true"
@@ -666,7 +666,7 @@
          <goal
           name="WP_parameter maxmat.2.1.6"
           locfile="examples/programs/max_matrix/../max_matrix.mlw"
-          loclnum="187" loccnumb="6" loccnume="12"
+          loclnum="183" loccnumb="6" loccnume="12"
           expl="parameter maxmat"
           sum="cb1808ab7a66e8c317deb5ac5b914803"
           proved="true"
@@ -690,12 +690,32 @@
      <goal
       name="WP_parameter maxmat.3"
       locfile="examples/programs/max_matrix/../max_matrix.mlw"
-      loclnum="187" loccnumb="6" loccnume="12"
+      loclnum="183" loccnumb="6" loccnume="12"
+      expl="postcondition"
+      sum="f41aaa46bb9b0ae792578e9ac89fd638"
+      proved="true"
+      expanded="false"
+      shape="ainfix =V3asumV5c0anAapermutationV5EIainvamk tV2AapostaTuple2c0abelowanaTuple2V3V4FFIainvV1AapreaTuple2c0abelowanIainvV1Iainfix =agetV0aTuple2V6V7aNoneFLamk tV0F">
+      <label
+       name="expl:parameter maxmat"/>
+      <proof
+       prover="0"
+       timelimit="5"
+       memlimit="1000"
+       obsolete="false"
+       archived="false">
+       <result status="valid" time="0.01"/>
+      </proof>
+     </goal>
+     <goal
+      name="WP_parameter maxmat.4"
+      locfile="examples/programs/max_matrix/../max_matrix.mlw"
+      loclnum="183" loccnumb="6" loccnume="12"
       expl="postcondition"
-      sum="4ff8cf62d45e87fac288a24f289f7f5f"
+      sum="c050c4e07f64a1c6a7d2f6d3fe2e262e"
       proved="true"
       expanded="false"
-      shape="ainfix &gt;=V3asumV5c0anIapermutationV5FAainfix =V3asumV6c0anAapermutationV6EIainvamk tV2AapostaTuple2c0abelowanaTuple2V3V4FFIainvV1AapreaTuple2c0abelowanIainvV1Iainfix =agetV0aTuple2V7V8aNoneFLamk tV0F">
+      shape="ainfix &gt;=V3asumV5c0anIapermutationV5FIainvamk tV2AapostaTuple2c0abelowanaTuple2V3V4FFIainvV1AapreaTuple2c0abelowanIainvV1Iainfix =agetV0aTuple2V6V7aNoneFLamk tV0F">
       <label
        name="expl:parameter maxmat"/>
       <transf
@@ -703,30 +723,10 @@
        proved="true"
        expanded="false">
        <goal
-        name="WP_parameter maxmat.3.1"
+        name="WP_parameter maxmat.4.1"
         locfile="examples/programs/max_matrix/../max_matrix.mlw"
-        loclnum="187" loccnumb="6" loccnume="12"
-        expl="parameter maxmat"
-        sum="f41aaa46bb9b0ae792578e9ac89fd638"
-        proved="true"
-        expanded="false"
-        shape="ainfix =V3asumV5c0anAapermutationV5EIainvamk tV2AapostaTuple2c0abelowanaTuple2V3V4FFIainvV1AapreaTuple2c0abelowanIainvV1Iainfix =agetV0aTuple2V6V7aNoneFLamk tV0F">
-        <label
-         name="expl:parameter maxmat"/>
-        <proof
-         prover="0"
-         timelimit="30"
-         memlimit="0"
-         obsolete="false"
-         archived="false">
-         <result status="valid" time="0.02"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter maxmat.3.2"
-        locfile="examples/programs/max_matrix/../max_matrix.mlw"
-        loclnum="187" loccnumb="6" loccnume="12"
-        expl="parameter maxmat"
+        loclnum="183" loccnumb="6" loccnume="12"
+        expl="postcondition"
         sum="c050c4e07f64a1c6a7d2f6d3fe2e262e"
         proved="true"
         expanded="false"
@@ -738,10 +738,10 @@
          proved="true"
          expanded="false">
          <goal
-          name="WP_parameter maxmat.3.2.1"
+          name="WP_parameter maxmat.4.1.1"
           locfile="examples/programs/max_matrix/../max_matrix.mlw"
-          loclnum="187" loccnumb="6" loccnume="12"
-          expl="parameter maxmat"
+          loclnum="183" loccnumb="6" loccnume="12"
+          expl="postcondition"
           sum="b77c1058358cee9b90c68b6f4a6a97cd"
           proved="true"
           expanded="false"
diff --git a/examples/programs/mccarthy/why3session.xml b/examples/programs/mccarthy/why3session.xml
index 8712b717df8c66f12109cac9f139aa61af5a2bbe..2242c3e1324c4c033d0466ed8af776a0e62242d8 100644
--- a/examples/programs/mccarthy/why3session.xml
+++ b/examples/programs/mccarthy/why3session.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE why3session SYSTEM "/users/demons/melquion/src/why3/share/why3session.dtd">
+<!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
  name="programs/mccarthy/why3session.xml" shape_version="2">
  <prover
@@ -40,7 +40,7 @@
     <label
      name="expl:parameter f91"/>
     <proof
-     prover="3"
+     prover="0"
      timelimit="2"
      memlimit="0"
      obsolete="false"
@@ -56,31 +56,31 @@
      <result status="valid" time="0.00"/>
     </proof>
     <proof
-     prover="0"
+     prover="2"
      timelimit="2"
      memlimit="0"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.02"/>
+     <result status="valid" time="0.00"/>
     </proof>
     <proof
-     prover="2"
+     prover="3"
      timelimit="2"
      memlimit="0"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.00"/>
+     <result status="valid" time="0.02"/>
     </proof>
    </goal>
    <goal
     name="WP_parameter f91_nonrec"
     locfile="programs/mccarthy/../mccarthy.mlw"
-    loclnum="29" loccnumb="6" loccnume="16"
+    loclnum="27" loccnumb="6" loccnume="16"
     expl="parameter f91_nonrec"
-    sum="04796446183bf45922b460d4b991fe6e"
+    sum="d1b193c1fd3e58725baefb5f12e0cdb5"
     proved="true"
     expanded="true"
-    shape="iainfix &gt;V2c0iainfix &gt;V1c100alexaTuple2ainfix +ainfix -c101V3ainfix *c10V4V4aTuple2ainfix +ainfix -c101V1ainfix *c10V2V2Aainfix =aiterV4V3afV0Aainfix &gt;=V4c0Iainfix =V4ainfix -V2c1FIainfix =V3ainfix -V1c10FalexaTuple2ainfix +ainfix -c101V5ainfix *c10V6V6aTuple2ainfix +ainfix -c101V1ainfix *c10V2V2Aainfix =aiterV6V5afV0Aainfix &gt;=V6c0Iainfix =V6ainfix +V2c1FIainfix =V5ainfix +V1c11Fainfix =V1afV0Iainfix =aiterV2V1afV0Aainfix &gt;=V2c0FAainfix =aiterc1V0afV0Aainfix &gt;=c1c0F">
+    shape="iainfix &gt;V2c0iainfix &gt;V1c100ainfix &lt;V4V2Aainfix &lt;=c0V2Aainfix =ainfix +ainfix -c101V1ainfix *c10V2ainfix +ainfix -c101V3ainfix *c10V4Oainfix &lt;ainfix +ainfix -c101V3ainfix *c10V4ainfix +ainfix -c101V1ainfix *c10V2Aainfix &lt;=c0ainfix +ainfix -c101V1ainfix *c10V2Aainfix =aiterV4V3afV0Aainfix &gt;=V4c0Iainfix =V4ainfix -V2c1FIainfix =V3ainfix -V1c10Fainfix &lt;V6V2Aainfix &lt;=c0V2Aainfix =ainfix +ainfix -c101V1ainfix *c10V2ainfix +ainfix -c101V5ainfix *c10V6Oainfix &lt;ainfix +ainfix -c101V5ainfix *c10V6ainfix +ainfix -c101V1ainfix *c10V2Aainfix &lt;=c0ainfix +ainfix -c101V1ainfix *c10V2Aainfix =aiterV6V5afV0Aainfix &gt;=V6c0Iainfix =V6ainfix +V2c1FIainfix =V5ainfix +V1c11Fainfix =V1afV0Iainfix =aiterV2V1afV0Aainfix &gt;=V2c0FAainfix =aiterc1V0afV0Aainfix &gt;=c1c0F">
     <label
      name="expl:parameter f91_nonrec"/>
     <transf
@@ -90,21 +90,21 @@
      <goal
       name="WP_parameter f91_nonrec.1"
       locfile="programs/mccarthy/../mccarthy.mlw"
-      loclnum="29" loccnumb="6" loccnume="16"
+      loclnum="27" loccnumb="6" loccnume="16"
       expl="loop invariant init"
-      sum="8a4c0129813d2407132237b8739c9604"
+      sum="ae6166e8c8818d12e911826e426dd9f7"
       proved="true"
       expanded="true"
       shape="ainfix =aiterc1V0afV0Aainfix &gt;=c1c0F">
       <label
        name="expl:parameter f91_nonrec"/>
       <proof
-       prover="3"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.00"/>
+       <result status="valid" time="0.01"/>
       </proof>
       <proof
        prover="1"
@@ -115,32 +115,32 @@
        <result status="valid" time="0.00"/>
       </proof>
       <proof
-       prover="0"
+       prover="3"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.00"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter f91_nonrec.2"
       locfile="programs/mccarthy/../mccarthy.mlw"
-      loclnum="29" loccnumb="6" loccnume="16"
+      loclnum="27" loccnumb="6" loccnume="16"
       expl="loop invariant preservation"
-      sum="0faa89d1debb2dcf2703520e14016566"
+      sum="da90012569e992314a5c7a1aee770bcd"
       proved="true"
       expanded="true"
       shape="ainfix =aiterV4V3afV0Aainfix &gt;=V4c0Iainfix =V4ainfix -V2c1FIainfix =V3ainfix -V1c10FIainfix &gt;V1c100Iainfix &gt;V2c0Iainfix =aiterV2V1afV0Aainfix &gt;=V2c0FF">
       <label
        name="expl:parameter f91_nonrec"/>
       <proof
-       prover="3"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.02"/>
+       <result status="valid" time="0.00"/>
       </proof>
       <proof
        prover="1"
@@ -151,32 +151,32 @@
        <result status="valid" time="0.02"/>
       </proof>
       <proof
-       prover="0"
+       prover="3"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.00"/>
+       <result status="valid" time="0.02"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter f91_nonrec.3"
       locfile="programs/mccarthy/../mccarthy.mlw"
-      loclnum="29" loccnumb="6" loccnume="16"
-      expl="loop variant decreases"
-      sum="88f932a54ba9a4d9a3a5644a580e92ab"
+      loclnum="27" loccnumb="6" loccnume="16"
+      expl="loop variant decrease"
+      sum="823d65d5ae26cc21a01ad2f22f9f39f9"
       proved="true"
       expanded="true"
-      shape="alexaTuple2ainfix +ainfix -c101V3ainfix *c10V4V4aTuple2ainfix +ainfix -c101V1ainfix *c10V2V2Iainfix =V4ainfix -V2c1FIainfix =V3ainfix -V1c10FIainfix &gt;V1c100Iainfix &gt;V2c0Iainfix =aiterV2V1afV0Aainfix &gt;=V2c0FF">
+      shape="ainfix &lt;V4V2Aainfix &lt;=c0V2Aainfix =ainfix +ainfix -c101V1ainfix *c10V2ainfix +ainfix -c101V3ainfix *c10V4Oainfix &lt;ainfix +ainfix -c101V3ainfix *c10V4ainfix +ainfix -c101V1ainfix *c10V2Aainfix &lt;=c0ainfix +ainfix -c101V1ainfix *c10V2Iainfix =V4ainfix -V2c1FIainfix =V3ainfix -V1c10FIainfix &gt;V1c100Iainfix &gt;V2c0Iainfix =aiterV2V1afV0Aainfix &gt;=V2c0FF">
       <label
        name="expl:parameter f91_nonrec"/>
       <proof
-       prover="3"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.03"/>
+       <result status="valid" time="0.01"/>
       </proof>
       <proof
        prover="1"
@@ -184,10 +184,10 @@
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.02"/>
+       <result status="valid" time="0.00"/>
       </proof>
       <proof
-       prover="0"
+       prover="3"
        timelimit="10"
        memlimit="0"
        obsolete="false"
@@ -198,21 +198,21 @@
      <goal
       name="WP_parameter f91_nonrec.4"
       locfile="programs/mccarthy/../mccarthy.mlw"
-      loclnum="29" loccnumb="6" loccnume="16"
+      loclnum="27" loccnumb="6" loccnume="16"
       expl="loop invariant preservation"
-      sum="672b2f4f31f3a20b5c664b04b894af4d"
+      sum="0300f0a48bf592f222c696bb47f33bc8"
       proved="true"
       expanded="true"
       shape="ainfix =aiterV4V3afV0Aainfix &gt;=V4c0Iainfix =V4ainfix +V2c1FIainfix =V3ainfix +V1c11FIainfix &gt;V1c100NIainfix &gt;V2c0Iainfix =aiterV2V1afV0Aainfix &gt;=V2c0FF">
       <label
        name="expl:parameter f91_nonrec"/>
       <proof
-       prover="3"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.02"/>
+       <result status="valid" time="0.43"/>
       </proof>
       <proof
        prover="1"
@@ -223,27 +223,27 @@
        <result status="valid" time="0.03"/>
       </proof>
       <proof
-       prover="0"
+       prover="3"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.43"/>
+       <result status="valid" time="0.02"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter f91_nonrec.5"
       locfile="programs/mccarthy/../mccarthy.mlw"
-      loclnum="29" loccnumb="6" loccnume="16"
-      expl="loop variant decreases"
-      sum="1919c161016957fa4f0b92e955814e92"
+      loclnum="27" loccnumb="6" loccnume="16"
+      expl="loop variant decrease"
+      sum="2ba38f0a77d0da9b72c74e94d8d5ec63"
       proved="true"
       expanded="true"
-      shape="alexaTuple2ainfix +ainfix -c101V3ainfix *c10V4V4aTuple2ainfix +ainfix -c101V1ainfix *c10V2V2Iainfix =V4ainfix +V2c1FIainfix =V3ainfix +V1c11FIainfix &gt;V1c100NIainfix &gt;V2c0Iainfix =aiterV2V1afV0Aainfix &gt;=V2c0FF">
+      shape="ainfix &lt;V4V2Aainfix &lt;=c0V2Aainfix =ainfix +ainfix -c101V1ainfix *c10V2ainfix +ainfix -c101V3ainfix *c10V4Oainfix &lt;ainfix +ainfix -c101V3ainfix *c10V4ainfix +ainfix -c101V1ainfix *c10V2Aainfix &lt;=c0ainfix +ainfix -c101V1ainfix *c10V2Iainfix =V4ainfix +V2c1FIainfix =V3ainfix +V1c11FIainfix &gt;V1c100NIainfix &gt;V2c0Iainfix =aiterV2V1afV0Aainfix &gt;=V2c0FF">
       <label
        name="expl:parameter f91_nonrec"/>
       <proof
-       prover="3"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
@@ -256,35 +256,35 @@
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.00"/>
+       <result status="valid" time="0.02"/>
       </proof>
       <proof
-       prover="0"
+       prover="3"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.03"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter f91_nonrec.6"
       locfile="programs/mccarthy/../mccarthy.mlw"
-      loclnum="29" loccnumb="6" loccnume="16"
-      expl="normal postcondition"
-      sum="c0f7f157cb5067076167e150d827cfbe"
+      loclnum="27" loccnumb="6" loccnume="16"
+      expl="postcondition"
+      sum="40f73c5f404577641c2909d94b38e3df"
       proved="true"
       expanded="true"
       shape="ainfix =V1afV0Iainfix &gt;V2c0NIainfix =aiterV2V1afV0Aainfix &gt;=V2c0FF">
       <label
        name="expl:parameter f91_nonrec"/>
       <proof
-       prover="3"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.02"/>
       </proof>
       <proof
        prover="1"
@@ -295,12 +295,12 @@
        <result status="valid" time="0.02"/>
       </proof>
       <proof
-       prover="0"
+       prover="3"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.02"/>
+       <result status="valid" time="0.01"/>
       </proof>
      </goal>
     </transf>
diff --git a/examples/programs/queens/why3session.xml b/examples/programs/queens/why3session.xml
index ce7d31df6c56ac65a28996ed0995129b37a3fed6..4bf3f800a66eb4290f223297ca3e0bb648c2dbe6 100644
--- a/examples/programs/queens/why3session.xml
+++ b/examples/programs/queens/why3session.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
- name="examples/programs/queens/why3session.xml" shape_version="2">
+ name="programs/queens/why3session.xml" shape_version="2">
  <prover
   id="0"
   name="Alt-Ergo"
@@ -32,7 +32,7 @@
   expanded="true">
   <theory
    name="S"
-   locfile="examples/programs/queens/../queens.mlw"
+   locfile="programs/queens/../queens.mlw"
    loclnum="8" loccnumb="7" loccnume="8"
    verified="true"
    expanded="false">
@@ -41,16 +41,16 @@
   </theory>
   <theory
    name="NQueensSetsTermination"
-   locfile="examples/programs/queens/../queens.mlw"
+   locfile="programs/queens/../queens.mlw"
    loclnum="24" loccnumb="7" loccnume="29"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter t"
-    locfile="examples/programs/queens/../queens.mlw"
+    locfile="programs/queens/../queens.mlw"
     loclnum="29" loccnumb="10" loccnume="11"
     expl="parameter t"
-    sum="33077d6cf5def2f22423c9f6d0891ce8"
+    sum="bcd4ecb576375a6d47ea54b0ed111a25"
     proved="true"
     expanded="true"
     shape="ainfix &lt;acardinalV7acardinalV4Aainfix &lt;=c0acardinalV4AasubsetV7adiffadiffV0V1V2Iainfix =V7aremoveamin_eltV4V4FIainfix =V6ainfix +V3V5FFAainfix &lt;acardinalaremoveamin_eltV4V0acardinalV0Aainfix &lt;=c0acardinalV0Iais_emptyV4NIasubsetV4adiffadiffV0V1V2FAasubsetadiffadiffV0V1V2adiffadiffV0V1V2Iais_emptyV0NF">
@@ -62,10 +62,10 @@
      expanded="true">
      <goal
       name="WP_parameter t.1"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="29" loccnumb="10" loccnume="11"
       expl="loop invariant init"
-      sum="6faef13d231575a27a6604164cb52f32"
+      sum="7909d1817a759b95e32e6f4bc55ffa19"
       proved="true"
       expanded="false"
       shape="asubsetadiffadiffV0V1V2adiffadiffV0V1V2Iais_emptyV0NF">
@@ -82,10 +82,10 @@
      </goal>
      <goal
       name="WP_parameter t.2"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="29" loccnumb="10" loccnume="11"
-      expl="variant decreases"
-      sum="a8e479026c50d89e2cc648ce86b64b4e"
+      expl="variant decrease"
+      sum="57133b74e1e212169c4b6967a0b6d82c"
       proved="true"
       expanded="false"
       shape="ainfix &lt;acardinalaremoveamin_eltV4V0acardinalV0Aainfix &lt;=c0acardinalV0Iais_emptyV4NIasubsetV4adiffadiffV0V1V2FIais_emptyV0NF">
@@ -102,10 +102,10 @@
      </goal>
      <goal
       name="WP_parameter t.3"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="29" loccnumb="10" loccnume="11"
       expl="loop invariant preservation"
-      sum="1dde377827b998f401a217241a19267d"
+      sum="8d66edf47d5a53626dacf776f9a7185a"
       proved="true"
       expanded="false"
       shape="asubsetV7adiffadiffV0V1V2Iainfix =V7aremoveamin_eltV4V4FIainfix =V6ainfix +V3V5FFIais_emptyV4NIasubsetV4adiffadiffV0V1V2FIais_emptyV0NF">
@@ -122,10 +122,10 @@
      </goal>
      <goal
       name="WP_parameter t.4"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="29" loccnumb="10" loccnume="11"
-      expl="loop variant decreases"
-      sum="18089c6d94691c0121d7adb8b5bf6c59"
+      expl="loop variant decrease"
+      sum="43872977045ca2f2f7920cf1860e6cc0"
       proved="true"
       expanded="false"
       shape="ainfix &lt;acardinalV7acardinalV4Aainfix &lt;=c0acardinalV4Iainfix =V7aremoveamin_eltV4V4FIainfix =V6ainfix +V3V5FFIais_emptyV4NIasubsetV4adiffadiffV0V1V2FIais_emptyV0NF">
@@ -145,13 +145,13 @@
   </theory>
   <theory
    name="Solution"
-   locfile="examples/programs/queens/../queens.mlw"
+   locfile="programs/queens/../queens.mlw"
    loclnum="46" loccnumb="7" loccnume="15"
    verified="true"
    expanded="false">
    <goal
     name="partial_solution_eq_prefix"
-    locfile="examples/programs/queens/../queens.mlw"
+    locfile="programs/queens/../queens.mlw"
     loclnum="72" loccnumb="8" loccnume="34"
     sum="ff862f43551bc9f152ac52a02c0fdc59"
     proved="true"
@@ -168,7 +168,7 @@
    </goal>
    <goal
     name="no_duplicate"
-    locfile="examples/programs/queens/../queens.mlw"
+    locfile="programs/queens/../queens.mlw"
     loclnum="86" loccnumb="8" loccnume="20"
     sum="e067163d7a3ccc6a3e169e3715897726"
     proved="true"
@@ -186,16 +186,16 @@
   </theory>
   <theory
    name="NQueensSets"
-   locfile="examples/programs/queens/../queens.mlw"
+   locfile="programs/queens/../queens.mlw"
    loclnum="94" loccnumb="7" loccnume="18"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter t3"
-    locfile="examples/programs/queens/../queens.mlw"
+    locfile="programs/queens/../queens.mlw"
     loclnum="107" loccnumb="10" loccnume="12"
     expl="parameter t3"
-    sum="28c5c98bfe1234d345821d2c2bbdef14"
+    sum="ef46f2552f2fbaf024a2723aaa1d8a47"
     proved="true"
     expanded="true"
     shape="iais_emptyV0Niais_emptyV8Nainfix &lt;acardinalV21acardinalV8Aainfix &lt;=c0acardinalV8Aaeq_prefixV4V16V3Aaeq_prefixV6V18V20Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V3V23Eqamemamixfix []V22V20adiffadiffadiffV0V1V2V21Aaeq_prefixV18V22V20AasolutionV22FAainfix &lt;V24V25IamemV25V21IamemV24adiffadiffadiffV0V1V2V21FAasortedV16V3V15Aapartial_solutionV20V18AasubsetV21adiffadiffV0V1V2Aainfix =V20V5Aainfix &gt;=ainfix -V15V3c0Aainfix =V19ainfix -V15V3Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV26amixfix []V16V27Aainfix &lt;V27V15Aainfix &lt;=V9V27Eqaeq_prefixV18V26V17AasolutionV26FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FAapartial_solutionV14V13Aainfix =amixfix []V13V29ainfix -ainfix +V28V14V29NIainfix &lt;V29V14Aainfix &lt;=c0V29FqamemV28apredaaddamin_eltV8V2NIainfix &gt;=V28c0FAainfix =amixfix []V13V31ainfix -ainfix +V30V31V14NIainfix &lt;V31V14Aainfix &lt;=c0V31FqamemV30asuccaaddamin_eltV8V1NIainfix &gt;=V30c0FAainfix =amixfix []V13V33V32NIainfix &lt;V33V14Aainfix &lt;=c0V33FAainfix &lt;V32anAainfix &lt;=c0V32qamemV32aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Aainfix &lt;acardinalaremoveamin_eltV8V0acardinalV0Aainfix &lt;=c0acardinalV0Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8Faeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV34amixfix []V10V35Aainfix &lt;V35V9Aainfix &lt;=V3V35Eqaeq_prefixV12V34V11AasolutionV34FAasortedV10V3V9Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3Iaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV36amixfix []V10V37Aainfix &lt;V37V9Aainfix &lt;=V3V37Eqamemamixfix []V36V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V36V11AasolutionV36FAainfix &lt;V38V39IamemV39V8IamemV38adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FAaeq_prefixV4V4V3Aaeq_prefixV6V6V5Aaeq_solV40amixfix []V4V41Aainfix &lt;V41V3Aainfix &lt;=V3V41Eqamemamixfix []V40V5adiffadiffadiffV0V1V2adiffadiffV0V1V2Aaeq_prefixV6V40V5AasolutionV40FAainfix &lt;V42V43IamemV43adiffadiffV0V1V2IamemV42adiffadiffadiffV0V1V2adiffadiffV0V1V2FAasortedV4V3V3Aapartial_solutionV5V6AasubsetadiffadiffV0V1V2adiffadiffV0V1V2Aainfix =V5V5Aainfix &gt;=ainfix -V3V3c0Aainfix =c0ainfix -V3V3aeq_prefixV4V44V3Aaeq_prefixV6V6V5Aaeq_solV46amixfix []V44V47Aainfix &lt;V47V45Aainfix &lt;=V3V47Eqaeq_prefixV6V46V5AasolutionV46FAasortedV44V3V45Aainfix =V5V5Aainfix &gt;=ainfix -V45V3c0Aainfix =c1ainfix -V45V3Iainfix =V45ainfix +V3c1FIainfix =V44amixfix [&lt;-]V4V3V6FIapartial_solutionV5V6Aainfix =amixfix []V6V49ainfix -ainfix +V48V5V49NIainfix &lt;V49V5Aainfix &lt;=c0V49FqamemV48V2NIainfix &gt;=V48c0FAainfix =amixfix []V6V51ainfix -ainfix +V50V51V5NIainfix &lt;V51V5Aainfix &lt;=c0V51FqamemV50V1NIainfix &gt;=V50c0FAainfix =amixfix []V6V53V52NIainfix &lt;V53V5Aainfix &lt;=c0V53FAainfix &lt;V52anAainfix &lt;=c0V52qamemV52V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -207,38 +207,38 @@
      expanded="true">
      <goal
       name="WP_parameter t3.1"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="107" loccnumb="10" loccnume="12"
       expl="loop invariant init"
-      sum="e7e7eaeda3fe480bf88bb82554afdf6e"
+      sum="d6ddcbc335222c53e0fd9bf4dff1f4d9"
       proved="true"
       expanded="false"
       shape="aeq_prefixV4V4V3Aaeq_prefixV6V6V5Aaeq_solV7amixfix []V4V8Aainfix &lt;V8V3Aainfix &lt;=V3V8Eqamemamixfix []V7V5adiffadiffadiffV0V1V2adiffadiffV0V1V2Aaeq_prefixV6V7V5AasolutionV7FAainfix &lt;V9V10IamemV10adiffadiffV0V1V2IamemV9adiffadiffadiffV0V1V2adiffadiffV0V1V2FAasortedV4V3V3Aapartial_solutionV5V6AasubsetadiffadiffV0V1V2adiffadiffV0V1V2Aainfix =V5V5Aainfix &gt;=ainfix -V3V3c0Aainfix =c0ainfix -V3V3Iais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V12ainfix -ainfix +V11V5V12NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V2NIainfix &gt;=V11c0FAainfix =amixfix []V6V14ainfix -ainfix +V13V14V5NIainfix &lt;V14V5Aainfix &lt;=c0V14FqamemV13V1NIainfix &gt;=V13c0FAainfix =amixfix []V6V16V15NIainfix &lt;V16V5Aainfix &lt;=c0V16FAainfix &lt;V15anAainfix &lt;=c0V15qamemV15V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
       <label
        name="expl:parameter t3"/>
       <proof
-       prover="1"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.03"/>
+       <result status="valid" time="0.04"/>
       </proof>
       <proof
-       prover="0"
+       prover="1"
        timelimit="10"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.04"/>
+       <result status="valid" time="0.03"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter t3.2"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="107" loccnumb="10" loccnume="12"
-      expl="variant decreases"
-      sum="0692b47c0825747101edac633ddcc7d6"
+      expl="variant decrease"
+      sum="84be2a5175588365da71ea7c52b7e1b1"
       proved="true"
       expanded="false"
       shape="ainfix &lt;acardinalaremoveamin_eltV8V0acardinalV0Aainfix &lt;=c0acardinalV0Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV15amixfix []V10V16Aainfix &lt;V16V9Aainfix &lt;=V3V16Eqamemamixfix []V15V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V15V11AasolutionV15FAainfix &lt;V17V18IamemV18V8IamemV17adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V20ainfix -ainfix +V19V5V20NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V2NIainfix &gt;=V19c0FAainfix =amixfix []V6V22ainfix -ainfix +V21V22V5NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V1NIainfix &gt;=V21c0FAainfix =amixfix []V6V24V23NIainfix &lt;V24V5Aainfix &lt;=c0V24FAainfix &lt;V23anAainfix &lt;=c0V23qamemV23V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -250,15 +250,15 @@
        memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="valid" time="1.48"/>
+       <result status="valid" time="0.38"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter t3.3"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="107" loccnumb="10" loccnume="12"
       expl="precondition"
-      sum="a607a7541386f74ce614d33f4bb93ef1"
+      sum="3d04620d5c7d2fc00bfea9d6a9926306"
       proved="true"
       expanded="true"
       shape="apartial_solutionV14V13Aainfix =amixfix []V13V16ainfix -ainfix +V15V14V16NIainfix &lt;V16V14Aainfix &lt;=c0V16FqamemV15apredaaddamin_eltV8V2NIainfix &gt;=V15c0FAainfix =amixfix []V13V18ainfix -ainfix +V17V18V14NIainfix &lt;V18V14Aainfix &lt;=c0V18FqamemV17asuccaaddamin_eltV8V1NIainfix &gt;=V17c0FAainfix =amixfix []V13V20V19NIainfix &lt;V20V14Aainfix &lt;=c0V20FAainfix &lt;V19anAainfix &lt;=c0V19qamemV19aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV21amixfix []V10V22Aainfix &lt;V22V9Aainfix &lt;=V3V22Eqamemamixfix []V21V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V21V11AasolutionV21FAainfix &lt;V23V24IamemV24V8IamemV23adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V26ainfix -ainfix +V25V5V26NIainfix &lt;V26V5Aainfix &lt;=c0V26FqamemV25V2NIainfix &gt;=V25c0FAainfix =amixfix []V6V28ainfix -ainfix +V27V28V5NIainfix &lt;V28V5Aainfix &lt;=c0V28FqamemV27V1NIainfix &gt;=V27c0FAainfix =amixfix []V6V30V29NIainfix &lt;V30V5Aainfix &lt;=c0V30FAainfix &lt;V29anAainfix &lt;=c0V29qamemV29V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -270,10 +270,10 @@
        expanded="true">
        <goal
         name="WP_parameter t3.3.1"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="768184e08dd966bf1db3889d30cd1c26"
+        sum="7a2f0e29357d44f1aa24aa3868719cc3"
         proved="true"
         expanded="false"
         shape="ainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV15amixfix []V10V16Aainfix &lt;V16V9Aainfix &lt;=V3V16Eqamemamixfix []V15V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V15V11AasolutionV15FAainfix &lt;V17V18IamemV18V8IamemV17adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V20ainfix -ainfix +V19V5V20NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V2NIainfix &gt;=V19c0FAainfix =amixfix []V6V22ainfix -ainfix +V21V22V5NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V1NIainfix &gt;=V21c0FAainfix =amixfix []V6V24V23NIainfix &lt;V24V5Aainfix &lt;=c0V24FAainfix &lt;V23anAainfix &lt;=c0V23qamemV23V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -290,10 +290,10 @@
        </goal>
        <goal
         name="WP_parameter t3.3.2"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="43d87a5e0c473b9613f2abf9478ccb12"
+        sum="4dfacd923d2b2eda5af65e177ea7c747"
         proved="true"
         expanded="false"
         shape="ainfix =ainfix +V14acardinalaremoveamin_eltV8V0anIainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV15amixfix []V10V16Aainfix &lt;V16V9Aainfix &lt;=V3V16Eqamemamixfix []V15V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V15V11AasolutionV15FAainfix &lt;V17V18IamemV18V8IamemV17adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V20ainfix -ainfix +V19V5V20NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V2NIainfix &gt;=V19c0FAainfix =amixfix []V6V22ainfix -ainfix +V21V22V5NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V1NIainfix &gt;=V21c0FAainfix =amixfix []V6V24V23NIainfix &lt;V24V5Aainfix &lt;=c0V24FAainfix &lt;V23anAainfix &lt;=c0V23qamemV23V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -305,15 +305,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.45"/>
+         <result status="valid" time="0.16"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter t3.3.3"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="bf61fe8f55cbd31c9836a5926dc99366"
+        sum="ef00522da1b1c2bcfe9933a24b6395d2"
         proved="true"
         expanded="false"
         shape="ainfix &gt;=V9c0Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV15amixfix []V10V16Aainfix &lt;V16V9Aainfix &lt;=V3V16Eqamemamixfix []V15V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V15V11AasolutionV15FAainfix &lt;V17V18IamemV18V8IamemV17adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V20ainfix -ainfix +V19V5V20NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V2NIainfix &gt;=V19c0FAainfix =amixfix []V6V22ainfix -ainfix +V21V22V5NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V1NIainfix &gt;=V21c0FAainfix =amixfix []V6V24V23NIainfix &lt;V24V5Aainfix &lt;=c0V24FAainfix &lt;V23anAainfix &lt;=c0V23qamemV23V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -330,10 +330,10 @@
        </goal>
        <goal
         name="WP_parameter t3.3.4"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="3b3807319c7cd92abbd87db3d5727db3"
+        sum="5d6932ad17cbfe9d39d926139b431e3d"
         proved="true"
         expanded="false"
         shape="ainfix &lt;=c0V15IamemV15aremoveamin_eltV8V0FIainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV16amixfix []V10V17Aainfix &lt;V17V9Aainfix &lt;=V3V17Eqamemamixfix []V16V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V16V11AasolutionV16FAainfix &lt;V18V19IamemV19V8IamemV18adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V21ainfix -ainfix +V20V5V21NIainfix &lt;V21V5Aainfix &lt;=c0V21FqamemV20V2NIainfix &gt;=V20c0FAainfix =amixfix []V6V23ainfix -ainfix +V22V23V5NIainfix &lt;V23V5Aainfix &lt;=c0V23FqamemV22V1NIainfix &gt;=V22c0FAainfix =amixfix []V6V25V24NIainfix &lt;V25V5Aainfix &lt;=c0V25FAainfix &lt;V24anAainfix &lt;=c0V24qamemV24V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -350,10 +350,10 @@
        </goal>
        <goal
         name="WP_parameter t3.3.5"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="b78eac5fdfc19dbb99c8662401950120"
+        sum="10309ffd05938c38130cde9592783c12"
         proved="true"
         expanded="false"
         shape="ainfix &lt;V15anIamemV15aremoveamin_eltV8V0FIainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV16amixfix []V10V17Aainfix &lt;V17V9Aainfix &lt;=V3V17Eqamemamixfix []V16V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V16V11AasolutionV16FAainfix &lt;V18V19IamemV19V8IamemV18adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V21ainfix -ainfix +V20V5V21NIainfix &lt;V21V5Aainfix &lt;=c0V21FqamemV20V2NIainfix &gt;=V20c0FAainfix =amixfix []V6V23ainfix -ainfix +V22V23V5NIainfix &lt;V23V5Aainfix &lt;=c0V23FqamemV22V1NIainfix &gt;=V22c0FAainfix =amixfix []V6V25V24NIainfix &lt;V25V5Aainfix &lt;=c0V25FAainfix &lt;V24anAainfix &lt;=c0V24qamemV24V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -370,10 +370,10 @@
        </goal>
        <goal
         name="WP_parameter t3.3.6"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="9f7eebf3a41ef2e8654e68068041baa3"
+        sum="6b34fd1b4055b0fcfc031eee90249888"
         proved="true"
         expanded="false"
         shape="ainfix =amixfix []V13V16V15NIainfix &lt;V16V14Aainfix &lt;=c0V16FIamemV15aremoveamin_eltV8V0FIainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV17amixfix []V10V18Aainfix &lt;V18V9Aainfix &lt;=V3V18Eqamemamixfix []V17V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V17V11AasolutionV17FAainfix &lt;V19V20IamemV20V8IamemV19adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V22ainfix -ainfix +V21V5V22NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V2NIainfix &gt;=V21c0FAainfix =amixfix []V6V24ainfix -ainfix +V23V24V5NIainfix &lt;V24V5Aainfix &lt;=c0V24FqamemV23V1NIainfix &gt;=V23c0FAainfix =amixfix []V6V26V25NIainfix &lt;V26V5Aainfix &lt;=c0V26FAainfix &lt;V25anAainfix &lt;=c0V25qamemV25V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -385,15 +385,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="1.75"/>
+         <result status="valid" time="0.65"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter t3.3.7"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="4405c158dd48210a2ab8d358e85cc7b6"
+        sum="420aba9fb4e4d11508893f7d73bdad25"
         proved="true"
         expanded="true"
         shape="amemV15aremoveamin_eltV8V0Iainfix =amixfix []V13V16V15NIainfix &lt;V16V14Aainfix &lt;=c0V16FAainfix &lt;V15anAainfix &lt;=c0V15FIainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV17amixfix []V10V18Aainfix &lt;V18V9Aainfix &lt;=V3V18Eqamemamixfix []V17V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V17V11AasolutionV17FAainfix &lt;V19V20IamemV20V8IamemV19adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V22ainfix -ainfix +V21V5V22NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V2NIainfix &gt;=V21c0FAainfix =amixfix []V6V24ainfix -ainfix +V23V24V5NIainfix &lt;V24V5Aainfix &lt;=c0V24FqamemV23V1NIainfix &gt;=V23c0FAainfix =amixfix []V6V26V25NIainfix &lt;V26V5Aainfix &lt;=c0V26FAainfix &lt;V25anAainfix &lt;=c0V25qamemV25V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -411,10 +411,10 @@
        </goal>
        <goal
         name="WP_parameter t3.3.8"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="e2465516e0533fe6af9e7e197c4074c3"
+        sum="242acdf86129985e57d1f875888e9b4f"
         proved="true"
         expanded="false"
         shape="ainfix =amixfix []V13V16ainfix -ainfix +V15V16V14NIainfix &lt;V16V14Aainfix &lt;=c0V16FIamemV15asuccaaddamin_eltV8V1NIainfix &gt;=V15c0FIainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV17amixfix []V10V18Aainfix &lt;V18V9Aainfix &lt;=V3V18Eqamemamixfix []V17V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V17V11AasolutionV17FAainfix &lt;V19V20IamemV20V8IamemV19adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V22ainfix -ainfix +V21V5V22NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V2NIainfix &gt;=V21c0FAainfix =amixfix []V6V24ainfix -ainfix +V23V24V5NIainfix &lt;V24V5Aainfix &lt;=c0V24FqamemV23V1NIainfix &gt;=V23c0FAainfix =amixfix []V6V26V25NIainfix &lt;V26V5Aainfix &lt;=c0V26FAainfix &lt;V25anAainfix &lt;=c0V25qamemV25V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -426,15 +426,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="6.63"/>
+         <result status="valid" time="2.46"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter t3.3.9"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="631a8a5b71e680a83ae55fb172565950"
+        sum="4d13c4d1bb4c80216876a988cc316c8c"
         proved="true"
         expanded="true"
         shape="amemV15asuccaaddamin_eltV8V1NIainfix =amixfix []V13V16ainfix -ainfix +V15V16V14NIainfix &lt;V16V14Aainfix &lt;=c0V16FIainfix &gt;=V15c0FIainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV17amixfix []V10V18Aainfix &lt;V18V9Aainfix &lt;=V3V18Eqamemamixfix []V17V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V17V11AasolutionV17FAainfix &lt;V19V20IamemV20V8IamemV19adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V22ainfix -ainfix +V21V5V22NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V2NIainfix &gt;=V21c0FAainfix =amixfix []V6V24ainfix -ainfix +V23V24V5NIainfix &lt;V24V5Aainfix &lt;=c0V24FqamemV23V1NIainfix &gt;=V23c0FAainfix =amixfix []V6V26V25NIainfix &lt;V26V5Aainfix &lt;=c0V26FAainfix &lt;V25anAainfix &lt;=c0V25qamemV25V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -452,10 +452,10 @@
        </goal>
        <goal
         name="WP_parameter t3.3.10"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="91b54177020b766b5db586dd0cc563f5"
+        sum="7fca8aacf7172c205e7c2cbe1de93083"
         proved="true"
         expanded="false"
         shape="ainfix =amixfix []V13V16ainfix -ainfix +V15V14V16NIainfix &lt;V16V14Aainfix &lt;=c0V16FIamemV15apredaaddamin_eltV8V2NIainfix &gt;=V15c0FIainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV17amixfix []V10V18Aainfix &lt;V18V9Aainfix &lt;=V3V18Eqamemamixfix []V17V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V17V11AasolutionV17FAainfix &lt;V19V20IamemV20V8IamemV19adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V22ainfix -ainfix +V21V5V22NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V2NIainfix &gt;=V21c0FAainfix =amixfix []V6V24ainfix -ainfix +V23V24V5NIainfix &lt;V24V5Aainfix &lt;=c0V24FqamemV23V1NIainfix &gt;=V23c0FAainfix =amixfix []V6V26V25NIainfix &lt;V26V5Aainfix &lt;=c0V26FAainfix &lt;V25anAainfix &lt;=c0V25qamemV25V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -467,15 +467,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="6.51"/>
+         <result status="valid" time="2.92"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter t3.3.11"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="579c2f33875f21789b42c7d2adb9a2b4"
+        sum="2eae4c99e07e3747a255d841ea9a86b5"
         proved="true"
         expanded="true"
         shape="amemV15apredaaddamin_eltV8V2NIainfix =amixfix []V13V16ainfix -ainfix +V15V14V16NIainfix &lt;V16V14Aainfix &lt;=c0V16FIainfix &gt;=V15c0FIainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV17amixfix []V10V18Aainfix &lt;V18V9Aainfix &lt;=V3V18Eqamemamixfix []V17V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V17V11AasolutionV17FAainfix &lt;V19V20IamemV20V8IamemV19adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V22ainfix -ainfix +V21V5V22NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V2NIainfix &gt;=V21c0FAainfix =amixfix []V6V24ainfix -ainfix +V23V24V5NIainfix &lt;V24V5Aainfix &lt;=c0V24FqamemV23V1NIainfix &gt;=V23c0FAainfix =amixfix []V6V26V25NIainfix &lt;V26V5Aainfix &lt;=c0V26FAainfix &lt;V25anAainfix &lt;=c0V25qamemV25V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -493,10 +493,10 @@
        </goal>
        <goal
         name="WP_parameter t3.3.12"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="0061fbc77410c7c8b8ff390b402d7c2b"
+        sum="ca5a0125e58ecc3909664c60fd8891c3"
         proved="true"
         expanded="true"
         shape="apartial_solutionV14V13Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV15amixfix []V10V16Aainfix &lt;V16V9Aainfix &lt;=V3V16Eqamemamixfix []V15V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V15V11AasolutionV15FAainfix &lt;V17V18IamemV18V8IamemV17adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V20ainfix -ainfix +V19V5V20NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V2NIainfix &gt;=V19c0FAainfix =amixfix []V6V22ainfix -ainfix +V21V22V5NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V1NIainfix &gt;=V21c0FAainfix =amixfix []V6V24V23NIainfix &lt;V24V5Aainfix &lt;=c0V24FAainfix &lt;V23anAainfix &lt;=c0V23qamemV23V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -508,10 +508,10 @@
          expanded="true">
          <goal
           name="WP_parameter t3.3.12.1"
-          locfile="examples/programs/queens/../queens.mlw"
+          locfile="programs/queens/../queens.mlw"
           loclnum="107" loccnumb="10" loccnume="12"
           expl="parameter t3"
-          sum="48b8f48748a902aa67db4e2f25dc9e49"
+          sum="5e4d46e2f012509f4d92a38a323066d3"
           proved="true"
           expanded="true"
           shape="ainfix =ainfix -amixfix []V13V15amixfix []V13V16ainfix -V16V15NAainfix =ainfix -amixfix []V13V15amixfix []V13V16ainfix -V15V16NAainfix =amixfix []V13V15amixfix []V13V16NIainfix &lt;V16V15Aainfix &lt;=c0V16FAainfix &lt;amixfix []V13V15anAainfix &lt;=c0amixfix []V13V15Iainfix &lt;V15V14Aainfix &lt;=c0V15FIainfix =V14ainfix +V11c1FIainfix =V13asetV12V11amin_eltV8FIamemV17V8NFNIainfix =amixfix []V4V18amixfix []V10V18Iainfix &lt;V18V3Aainfix &lt;=c0V18FAainfix =amixfix []V6V19amixfix []V12V19Iainfix &lt;V19V11Aainfix &lt;=c0V19FAaeq_prefixV20amixfix []V10V21anAainfix &lt;V21V9Aainfix =V3V21Oainfix &lt;V3V21Eqamemamixfix []V20V11adiffadiffadiffV0V1V2V8Aainfix =amixfix []V12V22amixfix []V20V22Iainfix &lt;V22V11Aainfix &lt;=c0V22FAapartial_solutionanV20FAainfix &lt;V23V24IamemV24V8IamemV23adiffadiffadiffV0V1V2V8FAalt_solamixfix []V10V25amixfix []V10V26Iainfix &lt;V26V9Aainfix &lt;V25V26Aainfix &lt;=V3V25FAainfix =ainfix -amixfix []V12V27amixfix []V12V28ainfix -V28V27NAainfix =ainfix -amixfix []V12V27amixfix []V12V28ainfix -V27V28NAainfix =amixfix []V12V27amixfix []V12V28NIainfix &lt;V28V27Aainfix &lt;=c0V28FAainfix &lt;amixfix []V12V27anAainfix &lt;=c0amixfix []V12V27Iainfix &lt;V27V11Aainfix &lt;=c0V27FAamemV29adiffadiffV0V1V2IamemV29V8FAainfix =V11V5Aainfix &lt;=c0ainfix -V9V3Aainfix =V7ainfix +V9aprefix -V3FIamemV30V0NFNIainfix =ainfix -amixfix []V6V31amixfix []V6V32ainfix -V32V31NAainfix =ainfix -amixfix []V6V31amixfix []V6V32ainfix -V31V32NAainfix =amixfix []V6V31amixfix []V6V32NIainfix &lt;V32V31Aainfix &lt;=c0V32FAainfix &lt;amixfix []V6V31anAainfix &lt;=c0amixfix []V6V31Iainfix &lt;V31V5Aainfix &lt;=c0V31FAainfix =agetV6V34ainfix +ainfix +V33V5aprefix -V34NIainfix &lt;V34V5Aainfix =c0V34Oainfix &lt;c0V34FqamemV33V2NIainfix &lt;=c0V33FAainfix =agetV6V36ainfix +ainfix +V35V36aprefix -V5NIainfix &lt;V36V5Aainfix =c0V36Oainfix &lt;c0V36FqamemV35V1NIainfix &lt;=c0V35FAainfix =agetV6V38V37NIainfix &lt;V38V5Aainfix =c0V38Oainfix &lt;c0V38FAainfix &lt;V37anAainfix =c0V37Oainfix &lt;c0V37qamemV37V0FAainfix &lt;=c0V3Aainfix =ainfix +V5acardinalV0anAainfix =c0V5Oainfix &lt;c0V5FF">
@@ -523,10 +523,10 @@
            expanded="true">
            <goal
             name="WP_parameter t3.3.12.1.1"
-            locfile="examples/programs/queens/../queens.mlw"
+            locfile="programs/queens/../queens.mlw"
             loclnum="107" loccnumb="10" loccnume="12"
             expl="parameter t3"
-            sum="d1ef0d7097d737f7c34b5b0cb4f3529c"
+            sum="977f266768b263e169d5165626b220c6"
             proved="true"
             expanded="true"
             shape="ainfix &lt;=c0amixfix []V13V15Iainfix &lt;V15V14Aainfix &lt;=c0V15FIainfix =V14ainfix +V11c1FIainfix =V13asetV12V11amin_eltV8FIamemV16V8NFNIainfix =amixfix []V4V17amixfix []V10V17Iainfix &lt;V17V3Aainfix &lt;=c0V17FAainfix =amixfix []V6V18amixfix []V12V18Iainfix &lt;V18V11Aainfix &lt;=c0V18FAaeq_prefixV19amixfix []V10V20anAainfix &lt;V20V9Aainfix =V3V20Oainfix &lt;V3V20Eqamemamixfix []V19V11adiffadiffadiffV0V1V2V8Aainfix =amixfix []V12V21amixfix []V19V21Iainfix &lt;V21V11Aainfix &lt;=c0V21FAapartial_solutionanV19FAainfix &lt;V22V23IamemV23V8IamemV22adiffadiffadiffV0V1V2V8FAalt_solamixfix []V10V24amixfix []V10V25Iainfix &lt;V25V9Aainfix &lt;V24V25Aainfix &lt;=V3V24FAainfix =ainfix -amixfix []V12V26amixfix []V12V27ainfix -V27V26NAainfix =ainfix -amixfix []V12V26amixfix []V12V27ainfix -V26V27NAainfix =amixfix []V12V26amixfix []V12V27NIainfix &lt;V27V26Aainfix &lt;=c0V27FAainfix &lt;amixfix []V12V26anAainfix &lt;=c0amixfix []V12V26Iainfix &lt;V26V11Aainfix &lt;=c0V26FAamemV28adiffadiffV0V1V2IamemV28V8FAainfix =V11V5Aainfix &lt;=c0ainfix -V9V3Aainfix =V7ainfix +V9aprefix -V3FIamemV29V0NFNIainfix =ainfix -amixfix []V6V30amixfix []V6V31ainfix -V31V30NAainfix =ainfix -amixfix []V6V30amixfix []V6V31ainfix -V30V31NAainfix =amixfix []V6V30amixfix []V6V31NIainfix &lt;V31V30Aainfix &lt;=c0V31FAainfix &lt;amixfix []V6V30anAainfix &lt;=c0amixfix []V6V30Iainfix &lt;V30V5Aainfix &lt;=c0V30FAainfix =agetV6V33ainfix +ainfix +V32V5aprefix -V33NIainfix &lt;V33V5Aainfix =c0V33Oainfix &lt;c0V33FqamemV32V2NIainfix &lt;=c0V32FAainfix =agetV6V35ainfix +ainfix +V34V35aprefix -V5NIainfix &lt;V35V5Aainfix =c0V35Oainfix &lt;c0V35FqamemV34V1NIainfix &lt;=c0V34FAainfix =agetV6V37V36NIainfix &lt;V37V5Aainfix =c0V37Oainfix &lt;c0V37FAainfix &lt;V36anAainfix =c0V36Oainfix &lt;c0V36qamemV36V0FAainfix &lt;=c0V3Aainfix =ainfix +V5acardinalV0anAainfix =c0V5Oainfix &lt;c0V5FF">
@@ -538,7 +538,7 @@
              memlimit="0"
              obsolete="false"
              archived="false">
-             <result status="valid" time="2.06"/>
+             <result status="valid" time="0.45"/>
             </proof>
             <proof
              prover="5"
@@ -546,35 +546,35 @@
              memlimit="0"
              obsolete="false"
              archived="false">
-             <result status="valid" time="0.63"/>
+             <result status="valid" time="0.20"/>
             </proof>
            </goal>
            <goal
             name="WP_parameter t3.3.12.1.2"
-            locfile="examples/programs/queens/../queens.mlw"
+            locfile="programs/queens/../queens.mlw"
             loclnum="107" loccnumb="10" loccnume="12"
             expl="parameter t3"
-            sum="d7d4c84d178b711fcdd205096609c8ab"
+            sum="65f4597d9543e27434bf018e7ce0755a"
             proved="true"
             expanded="false"
             shape="ainfix &lt;amixfix []V13V15anIainfix &lt;V15V14Aainfix &lt;=c0V15FIainfix =V14ainfix +V11c1FIainfix =V13asetV12V11amin_eltV8FIamemV16V8NFNIainfix =amixfix []V4V17amixfix []V10V17Iainfix &lt;V17V3Aainfix &lt;=c0V17FAainfix =amixfix []V6V18amixfix []V12V18Iainfix &lt;V18V11Aainfix &lt;=c0V18FAaeq_prefixV19amixfix []V10V20anAainfix &lt;V20V9Aainfix =V3V20Oainfix &lt;V3V20Eqamemamixfix []V19V11adiffadiffadiffV0V1V2V8Aainfix =amixfix []V12V21amixfix []V19V21Iainfix &lt;V21V11Aainfix &lt;=c0V21FAapartial_solutionanV19FAainfix &lt;V22V23IamemV23V8IamemV22adiffadiffadiffV0V1V2V8FAalt_solamixfix []V10V24amixfix []V10V25Iainfix &lt;V25V9Aainfix &lt;V24V25Aainfix &lt;=V3V24FAainfix =ainfix -amixfix []V12V26amixfix []V12V27ainfix -V27V26NAainfix =ainfix -amixfix []V12V26amixfix []V12V27ainfix -V26V27NAainfix =amixfix []V12V26amixfix []V12V27NIainfix &lt;V27V26Aainfix &lt;=c0V27FAainfix &lt;amixfix []V12V26anAainfix &lt;=c0amixfix []V12V26Iainfix &lt;V26V11Aainfix &lt;=c0V26FAamemV28adiffadiffV0V1V2IamemV28V8FAainfix =V11V5Aainfix &lt;=c0ainfix -V9V3Aainfix =V7ainfix +V9aprefix -V3FIamemV29V0NFNIainfix =ainfix -amixfix []V6V30amixfix []V6V31ainfix -V31V30NAainfix =ainfix -amixfix []V6V30amixfix []V6V31ainfix -V30V31NAainfix =amixfix []V6V30amixfix []V6V31NIainfix &lt;V31V30Aainfix &lt;=c0V31FAainfix &lt;amixfix []V6V30anAainfix &lt;=c0amixfix []V6V30Iainfix &lt;V30V5Aainfix &lt;=c0V30FAainfix =agetV6V33ainfix +ainfix +V32V5aprefix -V33NIainfix &lt;V33V5Aainfix =c0V33Oainfix &lt;c0V33FqamemV32V2NIainfix &lt;=c0V32FAainfix =agetV6V35ainfix +ainfix +V34V35aprefix -V5NIainfix &lt;V35V5Aainfix =c0V35Oainfix &lt;c0V35FqamemV34V1NIainfix &lt;=c0V34FAainfix =agetV6V37V36NIainfix &lt;V37V5Aainfix =c0V37Oainfix &lt;c0V37FAainfix &lt;V36anAainfix =c0V36Oainfix &lt;c0V36qamemV36V0FAainfix &lt;=c0V3Aainfix =ainfix +V5acardinalV0anAainfix =c0V5Oainfix &lt;c0V5FF">
             <label
              name="expl:parameter t3"/>
             <proof
-             prover="1"
+             prover="0"
              timelimit="30"
              memlimit="0"
              obsolete="false"
              archived="false">
-             <result status="valid" time="1.43"/>
+             <result status="valid" time="0.10"/>
             </proof>
             <proof
-             prover="0"
+             prover="1"
              timelimit="30"
              memlimit="0"
              obsolete="false"
              archived="false">
-             <result status="valid" time="0.22"/>
+             <result status="valid" time="0.64"/>
             </proof>
             <proof
              prover="2"
@@ -582,7 +582,7 @@
              memlimit="0"
              obsolete="false"
              archived="false">
-             <result status="valid" time="3.36"/>
+             <result status="valid" time="15.75"/>
             </proof>
             <proof
              prover="5"
@@ -590,15 +590,15 @@
              memlimit="0"
              obsolete="false"
              archived="false">
-             <result status="valid" time="0.61"/>
+             <result status="valid" time="0.26"/>
             </proof>
            </goal>
            <goal
             name="WP_parameter t3.3.12.1.3"
-            locfile="examples/programs/queens/../queens.mlw"
+            locfile="programs/queens/../queens.mlw"
             loclnum="107" loccnumb="10" loccnume="12"
             expl="parameter t3"
-            sum="88f3e5df75768ab2bf2f26b266cf3696"
+            sum="1148f0fc442f8347b4502f5483ccc5ae"
             proved="true"
             expanded="true"
             shape="ainfix =amixfix []V13V15amixfix []V13V16NIainfix &lt;V16V15Aainfix &lt;=c0V16FIainfix &lt;V15V14Aainfix &lt;=c0V15FIainfix =V14ainfix +V11c1FIainfix =V13asetV12V11amin_eltV8FIamemV17V8NFNIainfix =amixfix []V4V18amixfix []V10V18Iainfix &lt;V18V3Aainfix &lt;=c0V18FAainfix =amixfix []V6V19amixfix []V12V19Iainfix &lt;V19V11Aainfix &lt;=c0V19FAaeq_prefixV20amixfix []V10V21anAainfix &lt;V21V9Aainfix =V3V21Oainfix &lt;V3V21Eqamemamixfix []V20V11adiffadiffadiffV0V1V2V8Aainfix =amixfix []V12V22amixfix []V20V22Iainfix &lt;V22V11Aainfix &lt;=c0V22FAapartial_solutionanV20FAainfix &lt;V23V24IamemV24V8IamemV23adiffadiffadiffV0V1V2V8FAalt_solamixfix []V10V25amixfix []V10V26Iainfix &lt;V26V9Aainfix &lt;V25V26Aainfix &lt;=V3V25FAainfix =ainfix -amixfix []V12V27amixfix []V12V28ainfix -V28V27NAainfix =ainfix -amixfix []V12V27amixfix []V12V28ainfix -V27V28NAainfix =amixfix []V12V27amixfix []V12V28NIainfix &lt;V28V27Aainfix &lt;=c0V28FAainfix &lt;amixfix []V12V27anAainfix &lt;=c0amixfix []V12V27Iainfix &lt;V27V11Aainfix &lt;=c0V27FAamemV29adiffadiffV0V1V2IamemV29V8FAainfix =V11V5Aainfix &lt;=c0ainfix -V9V3Aainfix =V7ainfix +V9aprefix -V3FIamemV30V0NFNIainfix =ainfix -amixfix []V6V31amixfix []V6V32ainfix -V32V31NAainfix =ainfix -amixfix []V6V31amixfix []V6V32ainfix -V31V32NAainfix =amixfix []V6V31amixfix []V6V32NIainfix &lt;V32V31Aainfix &lt;=c0V32FAainfix &lt;amixfix []V6V31anAainfix &lt;=c0amixfix []V6V31Iainfix &lt;V31V5Aainfix &lt;=c0V31FAainfix =agetV6V34ainfix +ainfix +V33V5aprefix -V34NIainfix &lt;V34V5Aainfix =c0V34Oainfix &lt;c0V34FqamemV33V2NIainfix &lt;=c0V33FAainfix =agetV6V36ainfix +ainfix +V35V36aprefix -V5NIainfix &lt;V36V5Aainfix =c0V36Oainfix &lt;c0V36FqamemV35V1NIainfix &lt;=c0V35FAainfix =agetV6V38V37NIainfix &lt;V38V5Aainfix =c0V38Oainfix &lt;c0V38FAainfix &lt;V37anAainfix =c0V37Oainfix &lt;c0V37qamemV37V0FAainfix &lt;=c0V3Aainfix =ainfix +V5acardinalV0anAainfix =c0V5Oainfix &lt;c0V5FF">
@@ -611,15 +611,15 @@
              edited="queens_WP_NQueensSets_WP_parameter_t3_7.v"
              obsolete="false"
              archived="false">
-             <result status="valid" time="8.63"/>
+             <result status="valid" time="4.31"/>
             </proof>
            </goal>
            <goal
             name="WP_parameter t3.3.12.1.4"
-            locfile="examples/programs/queens/../queens.mlw"
+            locfile="programs/queens/../queens.mlw"
             loclnum="107" loccnumb="10" loccnume="12"
             expl="parameter t3"
-            sum="83ad8cf588fbdb374b9fadb2acccbcee"
+            sum="0f38d759233c4f904d36b17e9973c9b4"
             proved="true"
             expanded="true"
             shape="ainfix =ainfix -amixfix []V13V15amixfix []V13V16ainfix -V15V16NIainfix &lt;V16V15Aainfix &lt;=c0V16FIainfix &lt;V15V14Aainfix &lt;=c0V15FIainfix =V14ainfix +V11c1FIainfix =V13asetV12V11amin_eltV8FIamemV17V8NFNIainfix =amixfix []V4V18amixfix []V10V18Iainfix &lt;V18V3Aainfix &lt;=c0V18FAainfix =amixfix []V6V19amixfix []V12V19Iainfix &lt;V19V11Aainfix &lt;=c0V19FAaeq_prefixV20amixfix []V10V21anAainfix &lt;V21V9Aainfix =V3V21Oainfix &lt;V3V21Eqamemamixfix []V20V11adiffadiffadiffV0V1V2V8Aainfix =amixfix []V12V22amixfix []V20V22Iainfix &lt;V22V11Aainfix &lt;=c0V22FAapartial_solutionanV20FAainfix &lt;V23V24IamemV24V8IamemV23adiffadiffadiffV0V1V2V8FAalt_solamixfix []V10V25amixfix []V10V26Iainfix &lt;V26V9Aainfix &lt;V25V26Aainfix &lt;=V3V25FAainfix =ainfix -amixfix []V12V27amixfix []V12V28ainfix -V28V27NAainfix =ainfix -amixfix []V12V27amixfix []V12V28ainfix -V27V28NAainfix =amixfix []V12V27amixfix []V12V28NIainfix &lt;V28V27Aainfix &lt;=c0V28FAainfix &lt;amixfix []V12V27anAainfix &lt;=c0amixfix []V12V27Iainfix &lt;V27V11Aainfix &lt;=c0V27FAamemV29adiffadiffV0V1V2IamemV29V8FAainfix =V11V5Aainfix &lt;=c0ainfix -V9V3Aainfix =V7ainfix +V9aprefix -V3FIamemV30V0NFNIainfix =ainfix -amixfix []V6V31amixfix []V6V32ainfix -V32V31NAainfix =ainfix -amixfix []V6V31amixfix []V6V32ainfix -V31V32NAainfix =amixfix []V6V31amixfix []V6V32NIainfix &lt;V32V31Aainfix &lt;=c0V32FAainfix &lt;amixfix []V6V31anAainfix &lt;=c0amixfix []V6V31Iainfix &lt;V31V5Aainfix &lt;=c0V31FAainfix =agetV6V34ainfix +ainfix +V33V5aprefix -V34NIainfix &lt;V34V5Aainfix =c0V34Oainfix &lt;c0V34FqamemV33V2NIainfix &lt;=c0V33FAainfix =agetV6V36ainfix +ainfix +V35V36aprefix -V5NIainfix &lt;V36V5Aainfix =c0V36Oainfix &lt;c0V36FqamemV35V1NIainfix &lt;=c0V35FAainfix =agetV6V38V37NIainfix &lt;V38V5Aainfix =c0V38Oainfix &lt;c0V38FAainfix &lt;V37anAainfix =c0V37Oainfix &lt;c0V37qamemV37V0FAainfix &lt;=c0V3Aainfix =ainfix +V5acardinalV0anAainfix =c0V5Oainfix &lt;c0V5FF">
@@ -632,15 +632,15 @@
              edited="queens_WP_NQueensSets_WP_parameter_t3_8.v"
              obsolete="false"
              archived="false">
-             <result status="valid" time="3.17"/>
+             <result status="valid" time="2.58"/>
             </proof>
            </goal>
            <goal
             name="WP_parameter t3.3.12.1.5"
-            locfile="examples/programs/queens/../queens.mlw"
+            locfile="programs/queens/../queens.mlw"
             loclnum="107" loccnumb="10" loccnume="12"
             expl="parameter t3"
-            sum="93ebea592cd1d4d4b9f6d7dfcce29efe"
+            sum="40a73aeedd9e8e48435f5fa925ff3331"
             proved="true"
             expanded="false"
             shape="ainfix =ainfix -amixfix []V13V15amixfix []V13V16ainfix -V16V15NIainfix &lt;V16V15Aainfix &lt;=c0V16FIainfix &lt;V15V14Aainfix &lt;=c0V15FIainfix =V14ainfix +V11c1FIainfix =V13asetV12V11amin_eltV8FIamemV17V8NFNIainfix =amixfix []V4V18amixfix []V10V18Iainfix &lt;V18V3Aainfix &lt;=c0V18FAainfix =amixfix []V6V19amixfix []V12V19Iainfix &lt;V19V11Aainfix &lt;=c0V19FAaeq_prefixV20amixfix []V10V21anAainfix &lt;V21V9Aainfix =V3V21Oainfix &lt;V3V21Eqamemamixfix []V20V11adiffadiffadiffV0V1V2V8Aainfix =amixfix []V12V22amixfix []V20V22Iainfix &lt;V22V11Aainfix &lt;=c0V22FAapartial_solutionanV20FAainfix &lt;V23V24IamemV24V8IamemV23adiffadiffadiffV0V1V2V8FAalt_solamixfix []V10V25amixfix []V10V26Iainfix &lt;V26V9Aainfix &lt;V25V26Aainfix &lt;=V3V25FAainfix =ainfix -amixfix []V12V27amixfix []V12V28ainfix -V28V27NAainfix =ainfix -amixfix []V12V27amixfix []V12V28ainfix -V27V28NAainfix =amixfix []V12V27amixfix []V12V28NIainfix &lt;V28V27Aainfix &lt;=c0V28FAainfix &lt;amixfix []V12V27anAainfix &lt;=c0amixfix []V12V27Iainfix &lt;V27V11Aainfix &lt;=c0V27FAamemV29adiffadiffV0V1V2IamemV29V8FAainfix =V11V5Aainfix &lt;=c0ainfix -V9V3Aainfix =V7ainfix +V9aprefix -V3FIamemV30V0NFNIainfix =ainfix -amixfix []V6V31amixfix []V6V32ainfix -V32V31NAainfix =ainfix -amixfix []V6V31amixfix []V6V32ainfix -V31V32NAainfix =amixfix []V6V31amixfix []V6V32NIainfix &lt;V32V31Aainfix &lt;=c0V32FAainfix &lt;amixfix []V6V31anAainfix &lt;=c0amixfix []V6V31Iainfix &lt;V31V5Aainfix &lt;=c0V31FAainfix =agetV6V34ainfix +ainfix +V33V5aprefix -V34NIainfix &lt;V34V5Aainfix =c0V34Oainfix &lt;c0V34FqamemV33V2NIainfix &lt;=c0V33FAainfix =agetV6V36ainfix +ainfix +V35V36aprefix -V5NIainfix &lt;V36V5Aainfix =c0V36Oainfix &lt;c0V36FqamemV35V1NIainfix &lt;=c0V35FAainfix =agetV6V38V37NIainfix &lt;V38V5Aainfix =c0V38Oainfix &lt;c0V38FAainfix &lt;V37anAainfix =c0V37Oainfix &lt;c0V37qamemV37V0FAainfix &lt;=c0V3Aainfix =ainfix +V5acardinalV0anAainfix =c0V5Oainfix &lt;c0V5FF">
@@ -652,7 +652,7 @@
              memlimit="0"
              obsolete="false"
              archived="false">
-             <result status="valid" time="4.18"/>
+             <result status="valid" time="1.34"/>
             </proof>
            </goal>
           </transf>
@@ -663,10 +663,10 @@
      </goal>
      <goal
       name="WP_parameter t3.4"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="107" loccnumb="10" loccnume="12"
       expl="loop invariant preservation"
-      sum="a871fdace928fbd63e2bf8f0f3d70185"
+      sum="e6e85d0bb29188975ed53ef520b28d61"
       proved="true"
       expanded="true"
       shape="aeq_prefixV4V16V3Aaeq_prefixV6V18V20Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V3V23Eqamemamixfix []V22V20adiffadiffadiffV0V1V2V21Aaeq_prefixV18V22V20AasolutionV22FAainfix &lt;V24V25IamemV25V21IamemV24adiffadiffadiffV0V1V2V21FAasortedV16V3V15Aapartial_solutionV20V18AasubsetV21adiffadiffV0V1V2Aainfix =V20V5Aainfix &gt;=ainfix -V15V3c0Aainfix =V19ainfix -V15V3Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV26amixfix []V16V27Aainfix &lt;V27V15Aainfix &lt;=V9V27Eqaeq_prefixV18V26V17AasolutionV26FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V29ainfix -ainfix +V28V14V29NIainfix &lt;V29V14Aainfix &lt;=c0V29FqamemV28apredaaddamin_eltV8V2NIainfix &gt;=V28c0FAainfix =amixfix []V13V31ainfix -ainfix +V30V31V14NIainfix &lt;V31V14Aainfix &lt;=c0V31FqamemV30asuccaaddamin_eltV8V1NIainfix &gt;=V30c0FAainfix =amixfix []V13V33V32NIainfix &lt;V33V14Aainfix &lt;=c0V33FAainfix &lt;V32anAainfix &lt;=c0V32qamemV32aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV34amixfix []V10V35Aainfix &lt;V35V9Aainfix &lt;=V3V35Eqamemamixfix []V34V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V34V11AasolutionV34FAainfix &lt;V36V37IamemV37V8IamemV36adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V39ainfix -ainfix +V38V5V39NIainfix &lt;V39V5Aainfix &lt;=c0V39FqamemV38V2NIainfix &gt;=V38c0FAainfix =amixfix []V6V41ainfix -ainfix +V40V41V5NIainfix &lt;V41V5Aainfix &lt;=c0V41FqamemV40V1NIainfix &gt;=V40c0FAainfix =amixfix []V6V43V42NIainfix &lt;V43V5Aainfix &lt;=c0V43FAainfix &lt;V42anAainfix &lt;=c0V42qamemV42V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -678,10 +678,10 @@
        expanded="true">
        <goal
         name="WP_parameter t3.4.1"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="7761d31b900a285b00b082105f2877df"
+        sum="d5bf4b38a0313fa07c4e7e421c80cad7"
         proved="true"
         expanded="false"
         shape="ainfix =V19ainfix -V15V3Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V9V23Eqaeq_prefixV18V22V17AasolutionV22FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V25ainfix -ainfix +V24V14V25NIainfix &lt;V25V14Aainfix &lt;=c0V25FqamemV24apredaaddamin_eltV8V2NIainfix &gt;=V24c0FAainfix =amixfix []V13V27ainfix -ainfix +V26V27V14NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26asuccaaddamin_eltV8V1NIainfix &gt;=V26c0FAainfix =amixfix []V13V29V28NIainfix &lt;V29V14Aainfix &lt;=c0V29FAainfix &lt;V28anAainfix &lt;=c0V28qamemV28aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV30amixfix []V10V31Aainfix &lt;V31V9Aainfix &lt;=V3V31Eqamemamixfix []V30V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V30V11AasolutionV30FAainfix &lt;V32V33IamemV33V8IamemV32adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V35ainfix -ainfix +V34V5V35NIainfix &lt;V35V5Aainfix &lt;=c0V35FqamemV34V2NIainfix &gt;=V34c0FAainfix =amixfix []V6V37ainfix -ainfix +V36V37V5NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V1NIainfix &gt;=V36c0FAainfix =amixfix []V6V39V38NIainfix &lt;V39V5Aainfix &lt;=c0V39FAainfix &lt;V38anAainfix &lt;=c0V38qamemV38V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -698,10 +698,10 @@
        </goal>
        <goal
         name="WP_parameter t3.4.2"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="c1e2924910a2840cf586576df7ceeb2c"
+        sum="0976413939399b9556ba2d07099f0eb3"
         proved="true"
         expanded="false"
         shape="ainfix &gt;=ainfix -V15V3c0Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V9V23Eqaeq_prefixV18V22V17AasolutionV22FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V25ainfix -ainfix +V24V14V25NIainfix &lt;V25V14Aainfix &lt;=c0V25FqamemV24apredaaddamin_eltV8V2NIainfix &gt;=V24c0FAainfix =amixfix []V13V27ainfix -ainfix +V26V27V14NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26asuccaaddamin_eltV8V1NIainfix &gt;=V26c0FAainfix =amixfix []V13V29V28NIainfix &lt;V29V14Aainfix &lt;=c0V29FAainfix &lt;V28anAainfix &lt;=c0V28qamemV28aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV30amixfix []V10V31Aainfix &lt;V31V9Aainfix &lt;=V3V31Eqamemamixfix []V30V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V30V11AasolutionV30FAainfix &lt;V32V33IamemV33V8IamemV32adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V35ainfix -ainfix +V34V5V35NIainfix &lt;V35V5Aainfix &lt;=c0V35FqamemV34V2NIainfix &gt;=V34c0FAainfix =amixfix []V6V37ainfix -ainfix +V36V37V5NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V1NIainfix &gt;=V36c0FAainfix =amixfix []V6V39V38NIainfix &lt;V39V5Aainfix &lt;=c0V39FAainfix &lt;V38anAainfix &lt;=c0V38qamemV38V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -718,10 +718,10 @@
        </goal>
        <goal
         name="WP_parameter t3.4.3"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="064419ef0dda64dc8e1014dee4e7f7af"
+        sum="cb6ed28566f5e54bd28c606398ac0cfb"
         proved="true"
         expanded="false"
         shape="ainfix =V20V5Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V9V23Eqaeq_prefixV18V22V17AasolutionV22FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V25ainfix -ainfix +V24V14V25NIainfix &lt;V25V14Aainfix &lt;=c0V25FqamemV24apredaaddamin_eltV8V2NIainfix &gt;=V24c0FAainfix =amixfix []V13V27ainfix -ainfix +V26V27V14NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26asuccaaddamin_eltV8V1NIainfix &gt;=V26c0FAainfix =amixfix []V13V29V28NIainfix &lt;V29V14Aainfix &lt;=c0V29FAainfix &lt;V28anAainfix &lt;=c0V28qamemV28aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV30amixfix []V10V31Aainfix &lt;V31V9Aainfix &lt;=V3V31Eqamemamixfix []V30V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V30V11AasolutionV30FAainfix &lt;V32V33IamemV33V8IamemV32adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V35ainfix -ainfix +V34V5V35NIainfix &lt;V35V5Aainfix &lt;=c0V35FqamemV34V2NIainfix &gt;=V34c0FAainfix =amixfix []V6V37ainfix -ainfix +V36V37V5NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V1NIainfix &gt;=V36c0FAainfix =amixfix []V6V39V38NIainfix &lt;V39V5Aainfix &lt;=c0V39FAainfix &lt;V38anAainfix &lt;=c0V38qamemV38V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -738,10 +738,10 @@
        </goal>
        <goal
         name="WP_parameter t3.4.4"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="9485056a17f1980600d78157ab4f0cf4"
+        sum="9c24259e9b2c95f72e0832198761886d"
         proved="true"
         expanded="false"
         shape="asubsetV21adiffadiffV0V1V2Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V9V23Eqaeq_prefixV18V22V17AasolutionV22FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V25ainfix -ainfix +V24V14V25NIainfix &lt;V25V14Aainfix &lt;=c0V25FqamemV24apredaaddamin_eltV8V2NIainfix &gt;=V24c0FAainfix =amixfix []V13V27ainfix -ainfix +V26V27V14NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26asuccaaddamin_eltV8V1NIainfix &gt;=V26c0FAainfix =amixfix []V13V29V28NIainfix &lt;V29V14Aainfix &lt;=c0V29FAainfix &lt;V28anAainfix &lt;=c0V28qamemV28aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV30amixfix []V10V31Aainfix &lt;V31V9Aainfix &lt;=V3V31Eqamemamixfix []V30V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V30V11AasolutionV30FAainfix &lt;V32V33IamemV33V8IamemV32adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V35ainfix -ainfix +V34V5V35NIainfix &lt;V35V5Aainfix &lt;=c0V35FqamemV34V2NIainfix &gt;=V34c0FAainfix =amixfix []V6V37ainfix -ainfix +V36V37V5NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V1NIainfix &gt;=V36c0FAainfix =amixfix []V6V39V38NIainfix &lt;V39V5Aainfix &lt;=c0V39FAainfix &lt;V38anAainfix &lt;=c0V38qamemV38V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -758,10 +758,10 @@
        </goal>
        <goal
         name="WP_parameter t3.4.5"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="95613c7bdb509aa65707e77ce9fcb312"
+        sum="50a7b09bd34023cb4f3865b7f55485ae"
         proved="true"
         expanded="true"
         shape="apartial_solutionV20V18Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V9V23Eqaeq_prefixV18V22V17AasolutionV22FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V25ainfix -ainfix +V24V14V25NIainfix &lt;V25V14Aainfix &lt;=c0V25FqamemV24apredaaddamin_eltV8V2NIainfix &gt;=V24c0FAainfix =amixfix []V13V27ainfix -ainfix +V26V27V14NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26asuccaaddamin_eltV8V1NIainfix &gt;=V26c0FAainfix =amixfix []V13V29V28NIainfix &lt;V29V14Aainfix &lt;=c0V29FAainfix &lt;V28anAainfix &lt;=c0V28qamemV28aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV30amixfix []V10V31Aainfix &lt;V31V9Aainfix &lt;=V3V31Eqamemamixfix []V30V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V30V11AasolutionV30FAainfix &lt;V32V33IamemV33V8IamemV32adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V35ainfix -ainfix +V34V5V35NIainfix &lt;V35V5Aainfix &lt;=c0V35FqamemV34V2NIainfix &gt;=V34c0FAainfix =amixfix []V6V37ainfix -ainfix +V36V37V5NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V1NIainfix &gt;=V36c0FAainfix =amixfix []V6V39V38NIainfix &lt;V39V5Aainfix &lt;=c0V39FAainfix &lt;V38anAainfix &lt;=c0V38qamemV38V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -778,10 +778,10 @@
        </goal>
        <goal
         name="WP_parameter t3.4.6"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="5b81f2bb64e76698b1219965ef4df1cf"
+        sum="ce3ba03c4fd055f7ff589e7577d25be2"
         proved="true"
         expanded="true"
         shape="asortedV16V3V15Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V9V23Eqaeq_prefixV18V22V17AasolutionV22FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V25ainfix -ainfix +V24V14V25NIainfix &lt;V25V14Aainfix &lt;=c0V25FqamemV24apredaaddamin_eltV8V2NIainfix &gt;=V24c0FAainfix =amixfix []V13V27ainfix -ainfix +V26V27V14NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26asuccaaddamin_eltV8V1NIainfix &gt;=V26c0FAainfix =amixfix []V13V29V28NIainfix &lt;V29V14Aainfix &lt;=c0V29FAainfix &lt;V28anAainfix &lt;=c0V28qamemV28aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV30amixfix []V10V31Aainfix &lt;V31V9Aainfix &lt;=V3V31Eqamemamixfix []V30V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V30V11AasolutionV30FAainfix &lt;V32V33IamemV33V8IamemV32adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V35ainfix -ainfix +V34V5V35NIainfix &lt;V35V5Aainfix &lt;=c0V35FqamemV34V2NIainfix &gt;=V34c0FAainfix =amixfix []V6V37ainfix -ainfix +V36V37V5NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V1NIainfix &gt;=V36c0FAainfix =amixfix []V6V39V38NIainfix &lt;V39V5Aainfix &lt;=c0V39FAainfix &lt;V38anAainfix &lt;=c0V38qamemV38V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -799,10 +799,10 @@
        </goal>
        <goal
         name="WP_parameter t3.4.7"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="cef0530f8981542334b71eaac239b8b7"
+        sum="5342774584675654ef67cfaf47598b10"
         proved="true"
         expanded="true"
         shape="ainfix &lt;V22V23IamemV23V21IamemV22adiffadiffadiffV0V1V2V21FIainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV24amixfix []V16V25Aainfix &lt;V25V15Aainfix &lt;=V9V25Eqaeq_prefixV18V24V17AasolutionV24FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V27ainfix -ainfix +V26V14V27NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26apredaaddamin_eltV8V2NIainfix &gt;=V26c0FAainfix =amixfix []V13V29ainfix -ainfix +V28V29V14NIainfix &lt;V29V14Aainfix &lt;=c0V29FqamemV28asuccaaddamin_eltV8V1NIainfix &gt;=V28c0FAainfix =amixfix []V13V31V30NIainfix &lt;V31V14Aainfix &lt;=c0V31FAainfix &lt;V30anAainfix &lt;=c0V30qamemV30aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV32amixfix []V10V33Aainfix &lt;V33V9Aainfix &lt;=V3V33Eqamemamixfix []V32V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V32V11AasolutionV32FAainfix &lt;V34V35IamemV35V8IamemV34adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V37ainfix -ainfix +V36V5V37NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V2NIainfix &gt;=V36c0FAainfix =amixfix []V6V39ainfix -ainfix +V38V39V5NIainfix &lt;V39V5Aainfix &lt;=c0V39FqamemV38V1NIainfix &gt;=V38c0FAainfix =amixfix []V6V41V40NIainfix &lt;V41V5Aainfix &lt;=c0V41FAainfix &lt;V40anAainfix &lt;=c0V40qamemV40V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -820,10 +820,10 @@
        </goal>
        <goal
         name="WP_parameter t3.4.8"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="f22b5c1211d145f4d476607da7c25957"
+        sum="de9bccde7aaf9a0a1435323c86b24c3e"
         proved="true"
         expanded="false"
         shape="aeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V3V23EIamemamixfix []V22V20adiffadiffadiffV0V1V2V21Aaeq_prefixV18V22V20AasolutionV22FIainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV24amixfix []V16V25Aainfix &lt;V25V15Aainfix &lt;=V9V25Eqaeq_prefixV18V24V17AasolutionV24FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V27ainfix -ainfix +V26V14V27NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26apredaaddamin_eltV8V2NIainfix &gt;=V26c0FAainfix =amixfix []V13V29ainfix -ainfix +V28V29V14NIainfix &lt;V29V14Aainfix &lt;=c0V29FqamemV28asuccaaddamin_eltV8V1NIainfix &gt;=V28c0FAainfix =amixfix []V13V31V30NIainfix &lt;V31V14Aainfix &lt;=c0V31FAainfix &lt;V30anAainfix &lt;=c0V30qamemV30aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV32amixfix []V10V33Aainfix &lt;V33V9Aainfix &lt;=V3V33Eqamemamixfix []V32V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V32V11AasolutionV32FAainfix &lt;V34V35IamemV35V8IamemV34adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V37ainfix -ainfix +V36V5V37NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V2NIainfix &gt;=V36c0FAainfix =amixfix []V6V39ainfix -ainfix +V38V39V5NIainfix &lt;V39V5Aainfix &lt;=c0V39FqamemV38V1NIainfix &gt;=V38c0FAainfix =amixfix []V6V41V40NIainfix &lt;V41V5Aainfix &lt;=c0V41FAainfix &lt;V40anAainfix &lt;=c0V40qamemV40V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -835,15 +835,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="1.65"/>
+         <result status="valid" time="1.28"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter t3.4.9"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="a934c61bff74a538ae534647740b1b76"
+        sum="8cc6a057e1859cd13878999adad4d43b"
         proved="true"
         expanded="false"
         shape="asolutionV22Iaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V3V23EFIainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV24amixfix []V16V25Aainfix &lt;V25V15Aainfix &lt;=V9V25Eqaeq_prefixV18V24V17AasolutionV24FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V27ainfix -ainfix +V26V14V27NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26apredaaddamin_eltV8V2NIainfix &gt;=V26c0FAainfix =amixfix []V13V29ainfix -ainfix +V28V29V14NIainfix &lt;V29V14Aainfix &lt;=c0V29FqamemV28asuccaaddamin_eltV8V1NIainfix &gt;=V28c0FAainfix =amixfix []V13V31V30NIainfix &lt;V31V14Aainfix &lt;=c0V31FAainfix &lt;V30anAainfix &lt;=c0V30qamemV30aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV32amixfix []V10V33Aainfix &lt;V33V9Aainfix &lt;=V3V33Eqamemamixfix []V32V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V32V11AasolutionV32FAainfix &lt;V34V35IamemV35V8IamemV34adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V37ainfix -ainfix +V36V5V37NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V2NIainfix &gt;=V36c0FAainfix =amixfix []V6V39ainfix -ainfix +V38V39V5NIainfix &lt;V39V5Aainfix &lt;=c0V39FqamemV38V1NIainfix &gt;=V38c0FAainfix =amixfix []V6V41V40NIainfix &lt;V41V5Aainfix &lt;=c0V41FAainfix &lt;V40anAainfix &lt;=c0V40qamemV40V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -860,10 +860,10 @@
        </goal>
        <goal
         name="WP_parameter t3.4.10"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="8518b04451e259a8171a6144ddb6c05a"
+        sum="2952e674030ff02216a5867476a1ab88"
         proved="true"
         expanded="false"
         shape="aeq_prefixV18V22V20Iaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V3V23EFIainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV24amixfix []V16V25Aainfix &lt;V25V15Aainfix &lt;=V9V25Eqaeq_prefixV18V24V17AasolutionV24FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V27ainfix -ainfix +V26V14V27NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26apredaaddamin_eltV8V2NIainfix &gt;=V26c0FAainfix =amixfix []V13V29ainfix -ainfix +V28V29V14NIainfix &lt;V29V14Aainfix &lt;=c0V29FqamemV28asuccaaddamin_eltV8V1NIainfix &gt;=V28c0FAainfix =amixfix []V13V31V30NIainfix &lt;V31V14Aainfix &lt;=c0V31FAainfix &lt;V30anAainfix &lt;=c0V30qamemV30aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV32amixfix []V10V33Aainfix &lt;V33V9Aainfix &lt;=V3V33Eqamemamixfix []V32V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V32V11AasolutionV32FAainfix &lt;V34V35IamemV35V8IamemV34adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V37ainfix -ainfix +V36V5V37NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V2NIainfix &gt;=V36c0FAainfix =amixfix []V6V39ainfix -ainfix +V38V39V5NIainfix &lt;V39V5Aainfix &lt;=c0V39FqamemV38V1NIainfix &gt;=V38c0FAainfix =amixfix []V6V41V40NIainfix &lt;V41V5Aainfix &lt;=c0V41FAainfix &lt;V40anAainfix &lt;=c0V40qamemV40V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -875,15 +875,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="1.09"/>
+         <result status="valid" time="0.78"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter t3.4.11"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="6f1d7be9f0d0a33730621ae7781e2c7b"
+        sum="8e84be15bf906a215d401429fb3aa038"
         proved="true"
         expanded="false"
         shape="amemamixfix []V22V20adiffadiffadiffV0V1V2V21Iaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V3V23EFIainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV24amixfix []V16V25Aainfix &lt;V25V15Aainfix &lt;=V9V25Eqaeq_prefixV18V24V17AasolutionV24FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V27ainfix -ainfix +V26V14V27NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26apredaaddamin_eltV8V2NIainfix &gt;=V26c0FAainfix =amixfix []V13V29ainfix -ainfix +V28V29V14NIainfix &lt;V29V14Aainfix &lt;=c0V29FqamemV28asuccaaddamin_eltV8V1NIainfix &gt;=V28c0FAainfix =amixfix []V13V31V30NIainfix &lt;V31V14Aainfix &lt;=c0V31FAainfix &lt;V30anAainfix &lt;=c0V30qamemV30aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV32amixfix []V10V33Aainfix &lt;V33V9Aainfix &lt;=V3V33Eqamemamixfix []V32V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V32V11AasolutionV32FAainfix &lt;V34V35IamemV35V8IamemV34adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V37ainfix -ainfix +V36V5V37NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V2NIainfix &gt;=V36c0FAainfix =amixfix []V6V39ainfix -ainfix +V38V39V5NIainfix &lt;V39V5Aainfix &lt;=c0V39FqamemV38V1NIainfix &gt;=V38c0FAainfix =amixfix []V6V41V40NIainfix &lt;V41V5Aainfix &lt;=c0V41FAainfix &lt;V40anAainfix &lt;=c0V40qamemV40V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -895,15 +895,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="2.63"/>
+         <result status="valid" time="1.46"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter t3.4.12"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="5bbfc185daff454edaef1fff9ca5e842"
+        sum="952188e24f0137f1fb6d505d78854072"
         proved="true"
         expanded="false"
         shape="aeq_prefixV6V18V20Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V9V23Eqaeq_prefixV18V22V17AasolutionV22FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V25ainfix -ainfix +V24V14V25NIainfix &lt;V25V14Aainfix &lt;=c0V25FqamemV24apredaaddamin_eltV8V2NIainfix &gt;=V24c0FAainfix =amixfix []V13V27ainfix -ainfix +V26V27V14NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26asuccaaddamin_eltV8V1NIainfix &gt;=V26c0FAainfix =amixfix []V13V29V28NIainfix &lt;V29V14Aainfix &lt;=c0V29FAainfix &lt;V28anAainfix &lt;=c0V28qamemV28aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV30amixfix []V10V31Aainfix &lt;V31V9Aainfix &lt;=V3V31Eqamemamixfix []V30V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V30V11AasolutionV30FAainfix &lt;V32V33IamemV33V8IamemV32adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V35ainfix -ainfix +V34V5V35NIainfix &lt;V35V5Aainfix &lt;=c0V35FqamemV34V2NIainfix &gt;=V34c0FAainfix =amixfix []V6V37ainfix -ainfix +V36V37V5NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V1NIainfix &gt;=V36c0FAainfix =amixfix []V6V39V38NIainfix &lt;V39V5Aainfix &lt;=c0V39FAainfix &lt;V38anAainfix &lt;=c0V38qamemV38V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -920,10 +920,10 @@
        </goal>
        <goal
         name="WP_parameter t3.4.13"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="7317ae37cd2303bbcea23d4cc07a367e"
+        sum="638ea08cfa4d23a0656d2c0ee72046b0"
         proved="true"
         expanded="false"
         shape="aeq_prefixV4V16V3Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V9V23Eqaeq_prefixV18V22V17AasolutionV22FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V25ainfix -ainfix +V24V14V25NIainfix &lt;V25V14Aainfix &lt;=c0V25FqamemV24apredaaddamin_eltV8V2NIainfix &gt;=V24c0FAainfix =amixfix []V13V27ainfix -ainfix +V26V27V14NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26asuccaaddamin_eltV8V1NIainfix &gt;=V26c0FAainfix =amixfix []V13V29V28NIainfix &lt;V29V14Aainfix &lt;=c0V29FAainfix &lt;V28anAainfix &lt;=c0V28qamemV28aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV30amixfix []V10V31Aainfix &lt;V31V9Aainfix &lt;=V3V31Eqamemamixfix []V30V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V30V11AasolutionV30FAainfix &lt;V32V33IamemV33V8IamemV32adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V35ainfix -ainfix +V34V5V35NIainfix &lt;V35V5Aainfix &lt;=c0V35FqamemV34V2NIainfix &gt;=V34c0FAainfix =amixfix []V6V37ainfix -ainfix +V36V37V5NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V1NIainfix &gt;=V36c0FAainfix =amixfix []V6V39V38NIainfix &lt;V39V5Aainfix &lt;=c0V39FAainfix &lt;V38anAainfix &lt;=c0V38qamemV38V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -942,10 +942,10 @@
      </goal>
      <goal
       name="WP_parameter t3.5"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="107" loccnumb="10" loccnume="12"
-      expl="loop variant decreases"
-      sum="946eef241a74feb7c59a39cbd4eeacff"
+      expl="loop variant decrease"
+      sum="47bcd211a4152e568124b98d52069453"
       proved="true"
       expanded="false"
       shape="ainfix &lt;acardinalV21acardinalV8Aainfix &lt;=c0acardinalV8Iainfix =V21aremoveamin_eltV8V8FIainfix =V20ainfix -V17c1FIainfix =V19ainfix +V7ainfix -V15V9FIaeq_prefixV10V16V9Aaeq_prefixV13V18V17Aaeq_solV22amixfix []V16V23Aainfix &lt;V23V15Aainfix &lt;=V9V23Eqaeq_prefixV18V22V17AasolutionV22FAasortedV16V9V15Aainfix =V17V14Aainfix &gt;=ainfix -V15V9c0FIapartial_solutionV14V13Aainfix =amixfix []V13V25ainfix -ainfix +V24V14V25NIainfix &lt;V25V14Aainfix &lt;=c0V25FqamemV24apredaaddamin_eltV8V2NIainfix &gt;=V24c0FAainfix =amixfix []V13V27ainfix -ainfix +V26V27V14NIainfix &lt;V27V14Aainfix &lt;=c0V27FqamemV26asuccaaddamin_eltV8V1NIainfix &gt;=V26c0FAainfix =amixfix []V13V29V28NIainfix &lt;V29V14Aainfix &lt;=c0V29FAainfix &lt;V28anAainfix &lt;=c0V28qamemV28aremoveamin_eltV8V0FAainfix &gt;=V9c0Aainfix =ainfix +V14acardinalaremoveamin_eltV8V0anAainfix &lt;=c0V14Iainfix =V14ainfix +V11c1FIainfix =V13amixfix [&lt;-]V12V11amin_eltV8FIais_emptyV8NIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV30amixfix []V10V31Aainfix &lt;V31V9Aainfix &lt;=V3V31Eqamemamixfix []V30V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V30V11AasolutionV30FAainfix &lt;V32V33IamemV33V8IamemV32adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V35ainfix -ainfix +V34V5V35NIainfix &lt;V35V5Aainfix &lt;=c0V35FqamemV34V2NIainfix &gt;=V34c0FAainfix =amixfix []V6V37ainfix -ainfix +V36V37V5NIainfix &lt;V37V5Aainfix &lt;=c0V37FqamemV36V1NIainfix &gt;=V36c0FAainfix =amixfix []V6V39V38NIainfix &lt;V39V5Aainfix &lt;=c0V39FAainfix &lt;V38anAainfix &lt;=c0V38qamemV38V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -962,10 +962,10 @@
      </goal>
      <goal
       name="WP_parameter t3.6"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="107" loccnumb="10" loccnume="12"
-      expl="normal postcondition"
-      sum="33ef3871a051ec51cf8259bcb056cc03"
+      expl="postcondition"
+      sum="bf29208423dca569f3b24c551751eeb5"
       proved="true"
       expanded="true"
       shape="aeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14Eqaeq_prefixV12V13V11AasolutionV13FAasortedV10V3V9Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3Iais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV15amixfix []V10V16Aainfix &lt;V16V9Aainfix &lt;=V3V16Eqamemamixfix []V15V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V15V11AasolutionV15FAainfix &lt;V17V18IamemV18V8IamemV17adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V20ainfix -ainfix +V19V5V20NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V2NIainfix &gt;=V19c0FAainfix =amixfix []V6V22ainfix -ainfix +V21V22V5NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V1NIainfix &gt;=V21c0FAainfix =amixfix []V6V24V23NIainfix &lt;V24V5Aainfix &lt;=c0V24FAainfix &lt;V23anAainfix &lt;=c0V23qamemV23V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -977,10 +977,10 @@
        expanded="true">
        <goal
         name="WP_parameter t3.6.1"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="f119a84dc99b0146252da37dc7812a34"
+        sum="769f978571be26847b63234895d9cf4a"
         proved="true"
         expanded="false"
         shape="ainfix =V7ainfix -V9V3Iais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14Eqamemamixfix []V13V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V13V11AasolutionV13FAainfix &lt;V15V16IamemV16V8IamemV15adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V18ainfix -ainfix +V17V5V18NIainfix &lt;V18V5Aainfix &lt;=c0V18FqamemV17V2NIainfix &gt;=V17c0FAainfix =amixfix []V6V20ainfix -ainfix +V19V20V5NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V1NIainfix &gt;=V19c0FAainfix =amixfix []V6V22V21NIainfix &lt;V22V5Aainfix &lt;=c0V22FAainfix &lt;V21anAainfix &lt;=c0V21qamemV21V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -997,10 +997,10 @@
        </goal>
        <goal
         name="WP_parameter t3.6.2"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="d9774e51370c53197fb7afd0252fe3b7"
+        sum="916c78edf7c266d7b034e9d4331d23d8"
         proved="true"
         expanded="false"
         shape="ainfix &gt;=ainfix -V9V3c0Iais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14Eqamemamixfix []V13V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V13V11AasolutionV13FAainfix &lt;V15V16IamemV16V8IamemV15adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V18ainfix -ainfix +V17V5V18NIainfix &lt;V18V5Aainfix &lt;=c0V18FqamemV17V2NIainfix &gt;=V17c0FAainfix =amixfix []V6V20ainfix -ainfix +V19V20V5NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V1NIainfix &gt;=V19c0FAainfix =amixfix []V6V22V21NIainfix &lt;V22V5Aainfix &lt;=c0V22FAainfix &lt;V21anAainfix &lt;=c0V21qamemV21V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1017,10 +1017,10 @@
        </goal>
        <goal
         name="WP_parameter t3.6.3"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="d00ad78dda1e2af4a5f3c71a5629e4b5"
+        sum="160199e39f87897045cde2eea25a922b"
         proved="true"
         expanded="false"
         shape="ainfix =V11V5Iais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14Eqamemamixfix []V13V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V13V11AasolutionV13FAainfix &lt;V15V16IamemV16V8IamemV15adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V18ainfix -ainfix +V17V5V18NIainfix &lt;V18V5Aainfix &lt;=c0V18FqamemV17V2NIainfix &gt;=V17c0FAainfix =amixfix []V6V20ainfix -ainfix +V19V20V5NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V1NIainfix &gt;=V19c0FAainfix =amixfix []V6V22V21NIainfix &lt;V22V5Aainfix &lt;=c0V22FAainfix &lt;V21anAainfix &lt;=c0V21qamemV21V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1037,10 +1037,10 @@
        </goal>
        <goal
         name="WP_parameter t3.6.4"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="9dd10f0499bd72304089bca14efa6ed2"
+        sum="ef1ccb6f8b764b44c0cbd558328a9627"
         proved="true"
         expanded="false"
         shape="asortedV10V3V9Iais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14Eqamemamixfix []V13V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V13V11AasolutionV13FAainfix &lt;V15V16IamemV16V8IamemV15adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V18ainfix -ainfix +V17V5V18NIainfix &lt;V18V5Aainfix &lt;=c0V18FqamemV17V2NIainfix &gt;=V17c0FAainfix =amixfix []V6V20ainfix -ainfix +V19V20V5NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V1NIainfix &gt;=V19c0FAainfix =amixfix []V6V22V21NIainfix &lt;V22V5Aainfix &lt;=c0V22FAainfix &lt;V21anAainfix &lt;=c0V21qamemV21V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1057,10 +1057,10 @@
        </goal>
        <goal
         name="WP_parameter t3.6.5"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="f1b2084b6048f0f5366e2a89f2f17488"
+        sum="f05603833020699d29a99fea43c987a8"
         proved="true"
         expanded="true"
         shape="aeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14EIaeq_prefixV12V13V11AasolutionV13FIais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV15amixfix []V10V16Aainfix &lt;V16V9Aainfix &lt;=V3V16Eqamemamixfix []V15V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V15V11AasolutionV15FAainfix &lt;V17V18IamemV18V8IamemV17adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V20ainfix -ainfix +V19V5V20NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V2NIainfix &gt;=V19c0FAainfix =amixfix []V6V22ainfix -ainfix +V21V22V5NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V1NIainfix &gt;=V21c0FAainfix =amixfix []V6V24V23NIainfix &lt;V24V5Aainfix &lt;=c0V24FAainfix &lt;V23anAainfix &lt;=c0V23qamemV23V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1078,10 +1078,10 @@
        </goal>
        <goal
         name="WP_parameter t3.6.6"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="5a455a541817ae4cec3aaf700be06f4c"
+        sum="c38a7776615e1be2fd420e20472470ba"
         proved="true"
         expanded="false"
         shape="asolutionV13Iaeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14EFIais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV15amixfix []V10V16Aainfix &lt;V16V9Aainfix &lt;=V3V16Eqamemamixfix []V15V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V15V11AasolutionV15FAainfix &lt;V17V18IamemV18V8IamemV17adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V20ainfix -ainfix +V19V5V20NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V2NIainfix &gt;=V19c0FAainfix =amixfix []V6V22ainfix -ainfix +V21V22V5NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V1NIainfix &gt;=V21c0FAainfix =amixfix []V6V24V23NIainfix &lt;V24V5Aainfix &lt;=c0V24FAainfix &lt;V23anAainfix &lt;=c0V23qamemV23V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1098,10 +1098,10 @@
        </goal>
        <goal
         name="WP_parameter t3.6.7"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="12086a82c6deef02481fd8b67c7f54df"
+        sum="d95214dfc0d00500d71c43132b41609d"
         proved="true"
         expanded="false"
         shape="aeq_prefixV12V13V11Iaeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14EFIais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV15amixfix []V10V16Aainfix &lt;V16V9Aainfix &lt;=V3V16Eqamemamixfix []V15V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V15V11AasolutionV15FAainfix &lt;V17V18IamemV18V8IamemV17adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V20ainfix -ainfix +V19V5V20NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V2NIainfix &gt;=V19c0FAainfix =amixfix []V6V22ainfix -ainfix +V21V22V5NIainfix &lt;V22V5Aainfix &lt;=c0V22FqamemV21V1NIainfix &gt;=V21c0FAainfix =amixfix []V6V24V23NIainfix &lt;V24V5Aainfix &lt;=c0V24FAainfix &lt;V23anAainfix &lt;=c0V23qamemV23V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1118,17 +1118,17 @@
        </goal>
        <goal
         name="WP_parameter t3.6.8"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="d104b3a2e0fc6b74ed7269bbc72aca21"
+        sum="b354314ebc20f016aa0c1df249806bff"
         proved="true"
         expanded="false"
         shape="aeq_prefixV6V12V11Iais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14Eqamemamixfix []V13V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V13V11AasolutionV13FAainfix &lt;V15V16IamemV16V8IamemV15adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V18ainfix -ainfix +V17V5V18NIainfix &lt;V18V5Aainfix &lt;=c0V18FqamemV17V2NIainfix &gt;=V17c0FAainfix =amixfix []V6V20ainfix -ainfix +V19V20V5NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V1NIainfix &gt;=V19c0FAainfix =amixfix []V6V22V21NIainfix &lt;V22V5Aainfix &lt;=c0V22FAainfix &lt;V21anAainfix &lt;=c0V21qamemV21V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
         <label
          name="expl:parameter t3"/>
         <proof
-         prover="1"
+         prover="0"
          timelimit="10"
          memlimit="0"
          obsolete="false"
@@ -1136,7 +1136,7 @@
          <result status="valid" time="0.01"/>
         </proof>
         <proof
-         prover="0"
+         prover="1"
          timelimit="10"
          memlimit="0"
          obsolete="false"
@@ -1146,40 +1146,40 @@
        </goal>
        <goal
         name="WP_parameter t3.6.9"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="74af7f405b53ff303d4119d3300ec16e"
+        sum="c5cb36680baae2752f5b328eca9cc5c2"
         proved="true"
         expanded="false"
         shape="aeq_prefixV4V10V3Iais_emptyV8NNIaeq_prefixV4V10V3Aaeq_prefixV6V12V11Aaeq_solV13amixfix []V10V14Aainfix &lt;V14V9Aainfix &lt;=V3V14Eqamemamixfix []V13V11adiffadiffadiffV0V1V2V8Aaeq_prefixV12V13V11AasolutionV13FAainfix &lt;V15V16IamemV16V8IamemV15adiffadiffadiffV0V1V2V8FAasortedV10V3V9Aapartial_solutionV11V12AasubsetV8adiffadiffV0V1V2Aainfix =V11V5Aainfix &gt;=ainfix -V9V3c0Aainfix =V7ainfix -V9V3FIais_emptyV0NIapartial_solutionV5V6Aainfix =amixfix []V6V18ainfix -ainfix +V17V5V18NIainfix &lt;V18V5Aainfix &lt;=c0V18FqamemV17V2NIainfix &gt;=V17c0FAainfix =amixfix []V6V20ainfix -ainfix +V19V20V5NIainfix &lt;V20V5Aainfix &lt;=c0V20FqamemV19V1NIainfix &gt;=V19c0FAainfix =amixfix []V6V22V21NIainfix &lt;V22V5Aainfix &lt;=c0V22FAainfix &lt;V21anAainfix &lt;=c0V21qamemV21V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
         <label
          name="expl:parameter t3"/>
         <proof
-         prover="1"
+         prover="0"
          timelimit="10"
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.02"/>
+         <result status="valid" time="0.01"/>
         </proof>
         <proof
-         prover="0"
+         prover="1"
          timelimit="10"
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.01"/>
+         <result status="valid" time="0.02"/>
         </proof>
        </goal>
       </transf>
      </goal>
      <goal
       name="WP_parameter t3.7"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="107" loccnumb="10" loccnume="12"
-      expl="normal postcondition"
-      sum="26f561b3ce179861838971bb2409ed66"
+      expl="postcondition"
+      sum="d21d8ba0fec81023c519f8449d069acc"
       proved="true"
       expanded="true"
       shape="aeq_prefixV4V7V3Aaeq_prefixV6V6V5Aaeq_solV9amixfix []V7V10Aainfix &lt;V10V8Aainfix &lt;=V3V10Eqaeq_prefixV6V9V5AasolutionV9FAasortedV7V3V8Aainfix =V5V5Aainfix &gt;=ainfix -V8V3c0Aainfix =c1ainfix -V8V3Iainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V12ainfix -ainfix +V11V5V12NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V2NIainfix &gt;=V11c0FAainfix =amixfix []V6V14ainfix -ainfix +V13V14V5NIainfix &lt;V14V5Aainfix &lt;=c0V14FqamemV13V1NIainfix &gt;=V13c0FAainfix =amixfix []V6V16V15NIainfix &lt;V16V5Aainfix &lt;=c0V16FAainfix &lt;V15anAainfix &lt;=c0V15qamemV15V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1191,10 +1191,10 @@
        expanded="true">
        <goal
         name="WP_parameter t3.7.1"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="ff0c730405d96252dad5caa0ea52cbf9"
+        sum="94fea292374fee2097bdc01c131fba75"
         proved="true"
         expanded="true"
         shape="ainfix =c1ainfix -V8V3Iainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V10ainfix -ainfix +V9V5V10NIainfix &lt;V10V5Aainfix &lt;=c0V10FqamemV9V2NIainfix &gt;=V9c0FAainfix =amixfix []V6V12ainfix -ainfix +V11V12V5NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V1NIainfix &gt;=V11c0FAainfix =amixfix []V6V14V13NIainfix &lt;V14V5Aainfix &lt;=c0V14FAainfix &lt;V13anAainfix &lt;=c0V13qamemV13V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1211,10 +1211,10 @@
        </goal>
        <goal
         name="WP_parameter t3.7.2"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="531e8a6f6869a8b7cadaf60f9e8871c4"
+        sum="ad051706b3093f5f3a9fa621227b46d6"
         proved="true"
         expanded="true"
         shape="ainfix &gt;=ainfix -V8V3c0Iainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V10ainfix -ainfix +V9V5V10NIainfix &lt;V10V5Aainfix &lt;=c0V10FqamemV9V2NIainfix &gt;=V9c0FAainfix =amixfix []V6V12ainfix -ainfix +V11V12V5NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V1NIainfix &gt;=V11c0FAainfix =amixfix []V6V14V13NIainfix &lt;V14V5Aainfix &lt;=c0V14FAainfix &lt;V13anAainfix &lt;=c0V13qamemV13V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1231,10 +1231,10 @@
        </goal>
        <goal
         name="WP_parameter t3.7.3"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="ac5144c469e1f3f1ca19a639b6b2ca00"
+        sum="d634ca4d5c99dc685a30cb12c861b62a"
         proved="true"
         expanded="true"
         shape="ainfix =V5V5Iainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V10ainfix -ainfix +V9V5V10NIainfix &lt;V10V5Aainfix &lt;=c0V10FqamemV9V2NIainfix &gt;=V9c0FAainfix =amixfix []V6V12ainfix -ainfix +V11V12V5NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V1NIainfix &gt;=V11c0FAainfix =amixfix []V6V14V13NIainfix &lt;V14V5Aainfix &lt;=c0V14FAainfix &lt;V13anAainfix &lt;=c0V13qamemV13V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1251,10 +1251,10 @@
        </goal>
        <goal
         name="WP_parameter t3.7.4"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="949ef521d3f32bc88491cc55d717e9e1"
+        sum="68a032ff5945c0f1ffbc719471b17aad"
         proved="true"
         expanded="true"
         shape="asortedV7V3V8Iainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V10ainfix -ainfix +V9V5V10NIainfix &lt;V10V5Aainfix &lt;=c0V10FqamemV9V2NIainfix &gt;=V9c0FAainfix =amixfix []V6V12ainfix -ainfix +V11V12V5NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V1NIainfix &gt;=V11c0FAainfix =amixfix []V6V14V13NIainfix &lt;V14V5Aainfix &lt;=c0V14FAainfix &lt;V13anAainfix &lt;=c0V13qamemV13V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1271,10 +1271,10 @@
        </goal>
        <goal
         name="WP_parameter t3.7.5"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="50beef61bc71e3f693155fc90269dc38"
+        sum="6e05dd8574aa14cebe11c6989af59379"
         proved="true"
         expanded="true"
         shape="aeq_solV9amixfix []V7V10Aainfix &lt;V10V8Aainfix &lt;=V3V10EIaeq_prefixV6V9V5AasolutionV9FIainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V12ainfix -ainfix +V11V5V12NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V2NIainfix &gt;=V11c0FAainfix =amixfix []V6V14ainfix -ainfix +V13V14V5NIainfix &lt;V14V5Aainfix &lt;=c0V14FqamemV13V1NIainfix &gt;=V13c0FAainfix =amixfix []V6V16V15NIainfix &lt;V16V5Aainfix &lt;=c0V16FAainfix &lt;V15anAainfix &lt;=c0V15qamemV15V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1291,10 +1291,10 @@
        </goal>
        <goal
         name="WP_parameter t3.7.6"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="bc3fe68101419c1c6c3cbe4a1ac819a7"
+        sum="2fe61322add86f51867ae8fdffd85d56"
         proved="true"
         expanded="true"
         shape="asolutionV9Iaeq_solV9amixfix []V7V10Aainfix &lt;V10V8Aainfix &lt;=V3V10EFIainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V12ainfix -ainfix +V11V5V12NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V2NIainfix &gt;=V11c0FAainfix =amixfix []V6V14ainfix -ainfix +V13V14V5NIainfix &lt;V14V5Aainfix &lt;=c0V14FqamemV13V1NIainfix &gt;=V13c0FAainfix =amixfix []V6V16V15NIainfix &lt;V16V5Aainfix &lt;=c0V16FAainfix &lt;V15anAainfix &lt;=c0V15qamemV15V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1311,10 +1311,10 @@
        </goal>
        <goal
         name="WP_parameter t3.7.7"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="203d2a37c1abc3bb1ee51855c887e6b5"
+        sum="4058cd8aa36801d950185d4aefad4553"
         proved="true"
         expanded="false"
         shape="aeq_prefixV6V9V5Iaeq_solV9amixfix []V7V10Aainfix &lt;V10V8Aainfix &lt;=V3V10EFIainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V12ainfix -ainfix +V11V5V12NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V2NIainfix &gt;=V11c0FAainfix =amixfix []V6V14ainfix -ainfix +V13V14V5NIainfix &lt;V14V5Aainfix &lt;=c0V14FqamemV13V1NIainfix &gt;=V13c0FAainfix =amixfix []V6V16V15NIainfix &lt;V16V5Aainfix &lt;=c0V16FAainfix &lt;V15anAainfix &lt;=c0V15qamemV15V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1331,10 +1331,10 @@
        </goal>
        <goal
         name="WP_parameter t3.7.8"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="38f3ef653e1e2715fe75a435b8be6c95"
+        sum="54c139208ee6b44b1c87659d8ac8d084"
         proved="true"
         expanded="false"
         shape="aeq_prefixV6V6V5Iainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V10ainfix -ainfix +V9V5V10NIainfix &lt;V10V5Aainfix &lt;=c0V10FqamemV9V2NIainfix &gt;=V9c0FAainfix =amixfix []V6V12ainfix -ainfix +V11V12V5NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V1NIainfix &gt;=V11c0FAainfix =amixfix []V6V14V13NIainfix &lt;V14V5Aainfix &lt;=c0V14FAainfix &lt;V13anAainfix &lt;=c0V13qamemV13V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1351,10 +1351,10 @@
        </goal>
        <goal
         name="WP_parameter t3.7.9"
-        locfile="examples/programs/queens/../queens.mlw"
+        locfile="programs/queens/../queens.mlw"
         loclnum="107" loccnumb="10" loccnume="12"
         expl="parameter t3"
-        sum="9dca5360735b94012cee0a1e65335067"
+        sum="ab7258d8b9aed6d1c76adf2e2eb71733"
         proved="true"
         expanded="false"
         shape="aeq_prefixV4V7V3Iainfix =V8ainfix +V3c1FIainfix =V7amixfix [&lt;-]V4V3V6FIais_emptyV0NNIapartial_solutionV5V6Aainfix =amixfix []V6V10ainfix -ainfix +V9V5V10NIainfix &lt;V10V5Aainfix &lt;=c0V10FqamemV9V2NIainfix &gt;=V9c0FAainfix =amixfix []V6V12ainfix -ainfix +V11V12V5NIainfix &lt;V12V5Aainfix &lt;=c0V12FqamemV11V1NIainfix &gt;=V11c0FAainfix =amixfix []V6V14V13NIainfix &lt;V14V5Aainfix &lt;=c0V14FAainfix &lt;V13anAainfix &lt;=c0V13qamemV13V0FAainfix &gt;=V3c0Aainfix =ainfix +V5acardinalV0anAainfix &lt;=c0V5FF">
@@ -1375,10 +1375,10 @@
    </goal>
    <goal
     name="WP_parameter queens3"
-    locfile="examples/programs/queens/../queens.mlw"
+    locfile="programs/queens/../queens.mlw"
     loclnum="156" loccnumb="6" loccnume="13"
     expl="parameter queens3"
-    sum="8bc426fc5cc82621e8ab6e1088299d95"
+    sum="8c7bc3936fac8da00d67085f464a82df"
     proved="true"
     expanded="true"
     shape="aeq_solV10amixfix []V6V11Aainfix &lt;V11V9Aainfix &lt;=c0V11EqasolutionV10FAasortedV6c0V5Aainfix =V9V5Iaeq_prefixV2V6V1Aaeq_prefixV4V8V7Aaeq_solV12amixfix []V6V13Aainfix &lt;V13V5Aainfix &lt;=V1V13Eqaeq_prefixV8V12V7AasolutionV12FAasortedV6V1V5Aainfix =V7V3Aainfix &gt;=ainfix -V5V1c0Lainfix -V5V1FAapartial_solutionV3V4Aainfix =amixfix []V4V15ainfix -ainfix +V14V3V15NIainfix &lt;V15V3Aainfix &lt;=c0V15FqamemV14aemptyNIainfix &gt;=V14c0FAainfix =amixfix []V4V17ainfix -ainfix +V16V17V3NIainfix &lt;V17V3Aainfix &lt;=c0V17FqamemV16aemptyNIainfix &gt;=V16c0FAainfix =amixfix []V4V19V18NIainfix &lt;V19V3Aainfix &lt;=c0V19FAainfix &lt;V18anAainfix &lt;=c0V18qamemV18abelowV0FAainfix &gt;=V1c0Aainfix =ainfix +V3acardinalabelowV0anAainfix &lt;=c0V3Iainfix =V3c0Aainfix =V1c0Aainfix =V0anAainfix &lt;=c0V0FF">
@@ -1390,10 +1390,10 @@
      expanded="true">
      <goal
       name="WP_parameter queens3.1"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="156" loccnumb="6" loccnume="13"
       expl="precondition"
-      sum="dec9015628394b54dc0ec7ca80b22324"
+      sum="358d329423f14f318b4cc77bf5764e1d"
       proved="true"
       expanded="false"
       shape="apartial_solutionV3V4Aainfix =amixfix []V4V6ainfix -ainfix +V5V3V6NIainfix &lt;V6V3Aainfix &lt;=c0V6FqamemV5aemptyNIainfix &gt;=V5c0FAainfix =amixfix []V4V8ainfix -ainfix +V7V8V3NIainfix &lt;V8V3Aainfix &lt;=c0V8FqamemV7aemptyNIainfix &gt;=V7c0FAainfix =amixfix []V4V10V9NIainfix &lt;V10V3Aainfix &lt;=c0V10FAainfix &lt;V9anAainfix &lt;=c0V9qamemV9abelowV0FAainfix &gt;=V1c0Aainfix =ainfix +V3acardinalabelowV0anAainfix &lt;=c0V3Iainfix =V3c0Aainfix =V1c0Aainfix =V0anAainfix &lt;=c0V0FF">
@@ -1410,10 +1410,10 @@
      </goal>
      <goal
       name="WP_parameter queens3.2"
-      locfile="examples/programs/queens/../queens.mlw"
+      locfile="programs/queens/../queens.mlw"
       loclnum="156" loccnumb="6" loccnume="13"
-      expl="normal postcondition"
-      sum="adb8d98a75eddca8661fdb1246080647"
+      expl="postcondition"
+      sum="ebb3d6f421b8e09fa9f9b40beb677ace"
       proved="true"
       expanded="false"
       shape="aeq_solV10amixfix []V6V11Aainfix &lt;V11V9Aainfix &lt;=c0V11EqasolutionV10FAasortedV6c0V5Aainfix =V9V5Iaeq_prefixV2V6V1Aaeq_prefixV4V8V7Aaeq_solV12amixfix []V6V13Aainfix &lt;V13V5Aainfix &lt;=V1V13Eqaeq_prefixV8V12V7AasolutionV12FAasortedV6V1V5Aainfix =V7V3Aainfix &gt;=ainfix -V5V1c0Lainfix -V5V1FIapartial_solutionV3V4Aainfix =amixfix []V4V15ainfix -ainfix +V14V3V15NIainfix &lt;V15V3Aainfix &lt;=c0V15FqamemV14aemptyNIainfix &gt;=V14c0FAainfix =amixfix []V4V17ainfix -ainfix +V16V17V3NIainfix &lt;V17V3Aainfix &lt;=c0V17FqamemV16aemptyNIainfix &gt;=V16c0FAainfix =amixfix []V4V19V18NIainfix &lt;V19V3Aainfix &lt;=c0V19FAainfix &lt;V18anAainfix &lt;=c0V18qamemV18abelowV0FAainfix &gt;=V1c0Aainfix =ainfix +V3acardinalabelowV0anAainfix &lt;=c0V3Iainfix =V3c0Aainfix =V1c0Aainfix =V0anAainfix &lt;=c0V0FF">
diff --git a/examples/programs/sf/why3session.xml b/examples/programs/sf/why3session.xml
index 45d34b4baffca8a2771273f95e1edfa73d8ce41b..9a0db3d215c601b049a8be41b0e439fd8d6b8b1f 100644
--- a/examples/programs/sf/why3session.xml
+++ b/examples/programs/sf/why3session.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE why3session SYSTEM "/users/demons/melquion/src/why3/share/why3session.dtd">
+<!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
  name="programs/sf/why3session.xml" shape_version="2">
  <prover
@@ -71,7 +71,7 @@
    <goal
     name="WP_parameter slow_addition"
     locfile="programs/sf/../sf.mlw"
-    loclnum="35" loccnumb="6" loccnume="19"
+    loclnum="34" loccnumb="6" loccnume="19"
     expl="parameter slow_addition"
     sum="1205ea7611caab78dfb0d6922eb92303"
     proved="true"
@@ -91,7 +91,7 @@
    <goal
     name="even_not_odd"
     locfile="programs/sf/../sf.mlw"
-    loclnum="51" loccnumb="8" loccnume="20"
+    loclnum="49" loccnumb="8" loccnume="20"
     sum="4e6c14b147fdb4e01ed196b1edcdc185"
     proved="true"
     expanded="true"
@@ -109,7 +109,7 @@
    <goal
     name="WP_parameter parity"
     locfile="programs/sf/../sf.mlw"
-    loclnum="53" loccnumb="6" loccnume="12"
+    loclnum="51" loccnumb="6" loccnume="12"
     expl="parameter parity"
     sum="acbb72b6d3ec37edddb9346773255ba2"
     proved="true"
@@ -129,7 +129,7 @@
    <goal
     name="WP_parameter sqrt"
     locfile="programs/sf/../sf.mlw"
-    loclnum="68" loccnumb="6" loccnume="10"
+    loclnum="65" loccnumb="6" loccnume="10"
     expl="parameter sqrt"
     sum="4d1d6d0f7e7f06b557d80b916858d9fd"
     proved="true"
@@ -149,7 +149,7 @@
    <goal
     name="WP_parameter factorial"
     locfile="programs/sf/../sf.mlw"
-    loclnum="83" loccnumb="6" loccnume="15"
+    loclnum="80" loccnumb="6" loccnume="15"
     expl="parameter factorial"
     sum="76f29b53c8dac1719095a3029188288f"
     proved="true"
@@ -170,18 +170,18 @@
   <theory
    name="MoreHoareLogic"
    locfile="programs/sf/../sf.mlw"
-   loclnum="96" loccnumb="7" loccnume="21"
+   loclnum="92" loccnumb="7" loccnume="21"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter list_sum"
     locfile="programs/sf/../sf.mlw"
-    loclnum="112" loccnumb="6" loccnume="14"
+    loclnum="111" loccnumb="6" loccnume="14"
     expl="parameter list_sum"
-    sum="f6986d59229b013f6a9c8ced4d7e92d8"
+    sum="0b503f96a5ca85d26942a9245f4e488b"
     proved="true"
     expanded="true"
-    shape="iainfix =V3aNilNainfix &lt;alengthV7alengthV3Aainfix &lt;=c0alengthV3Aainfix =ainfix +V5asumV7asumV0Aainfix &lt;=alengthV7alengthV0Iainfix =V7V6FICV3aNilfaConswVainfix =V6V8FAainfix =V3aNilNIainfix =V5ainfix +V2V4FICV3aNilfaConsVwainfix =V4V9FAainfix =V3aNilNainfix =V2asumV0Iainfix =ainfix +V2asumV3asumV0Aainfix &lt;=alengthV3alengthV0FAainfix =ainfix +V1asumV0asumV0Aainfix &lt;=alengthV0alengthV0Iainfix =V1c0FF">
+    shape="iainfix =V3aNilNCV3aNilfaConswVainfix =V8V7Aainfix =ainfix +V5asumV7asumV0Aainfix &lt;=alengthV7alengthV0Iainfix =V7V6FICV3aNilfaConswVainfix =V6V9FAainfix =V3aNilNIainfix =V5ainfix +V2V4FICV3aNilfaConsVwainfix =V4V10FAainfix =V3aNilNainfix =V2asumV0Iainfix =ainfix +V2asumV3asumV0Aainfix &lt;=alengthV3alengthV0FAainfix =ainfix +V1asumV0asumV0Aainfix &lt;=alengthV0alengthV0Iainfix =V1c0FF">
     <label
      name="expl:parameter list_sum"/>
     <proof
@@ -196,12 +196,12 @@
    <goal
     name="WP_parameter list_member"
     locfile="programs/sf/../sf.mlw"
-    loclnum="129" loccnumb="6" loccnume="17"
+    loclnum="127" loccnumb="6" loccnume="17"
     expl="parameter list_member"
-    sum="fc84ce5d86af91915f250aa47d26bf92"
+    sum="44eb6092d7febeba43a274decaac7e0e"
     proved="true"
     expanded="true"
-    shape="iainfix =V4aNilNiainfix =V0V5ainfix &lt;alengthV8alengthV4Aainfix &lt;=c0alengthV4AamemV0V8IamemV0V1Aainfix =V6c0OamemV0V1Aainfix =V6c1AamemV0V1IamemV0V8Aainfix &lt;=alengthV8alengthV1Iainfix =V8V7FICV4aNilfaConswVainfix =V7V9FAainfix =V4aNilNIainfix =V6c1Fainfix &lt;alengthV11alengthV4Aainfix &lt;=c0alengthV4AamemV0V11IamemV0V1Aainfix =V3c0OamemV0V1Aainfix =V3c1AamemV0V1IamemV0V11Aainfix &lt;=alengthV11alengthV1Iainfix =V11V10FICV4aNilfaConswVainfix =V10V12FAainfix =V4aNilNICV4aNilfaConsVwainfix =V5V13FAainfix =V4aNilNamemV0V1qainfix =V3c1IamemV0V4IamemV0V1Aainfix =V3c0OamemV0V1Aainfix =V3c1AamemV0V1IamemV0V4Aainfix &lt;=alengthV4alengthV1FAamemV0V1IamemV0V1Aainfix =V2c0OamemV0V1Aainfix =V2c1AamemV0V1IamemV0V1Aainfix &lt;=alengthV1alengthV1Iainfix =V2c0FFF">
+    shape="iainfix =V4aNilNiainfix =V0V5CV4aNilfaConswVainfix =V9V8AamemV0V8IamemV0V1Aainfix =V6c0OamemV0V1Aainfix =V6c1AamemV0V1IamemV0V8Aainfix &lt;=alengthV8alengthV1Iainfix =V8V7FICV4aNilfaConswVainfix =V7V10FAainfix =V4aNilNIainfix =V6c1FCV4aNilfaConswVainfix =V13V12AamemV0V12IamemV0V1Aainfix =V3c0OamemV0V1Aainfix =V3c1AamemV0V1IamemV0V12Aainfix &lt;=alengthV12alengthV1Iainfix =V12V11FICV4aNilfaConswVainfix =V11V14FAainfix =V4aNilNICV4aNilfaConsVwainfix =V5V15FAainfix =V4aNilNamemV0V1qainfix =V3c1IamemV0V4IamemV0V1Aainfix =V3c0OamemV0V1Aainfix =V3c1AamemV0V1IamemV0V4Aainfix &lt;=alengthV4alengthV1FAamemV0V1IamemV0V1Aainfix =V2c0OamemV0V1Aainfix =V2c1AamemV0V1IamemV0V1Aainfix &lt;=alengthV1alengthV1Iainfix =V2c0FFF">
     <label
      name="expl:parameter list_member"/>
     <transf
@@ -211,7 +211,7 @@
      <goal
       name="WP_parameter list_member.1"
       locfile="programs/sf/../sf.mlw"
-      loclnum="129" loccnumb="6" loccnume="17"
+      loclnum="127" loccnumb="6" loccnume="17"
       expl="loop invariant init"
       sum="d6d730455c255dfacca7bc41a2702392"
       proved="true"
@@ -231,7 +231,7 @@
      <goal
       name="WP_parameter list_member.2"
       locfile="programs/sf/../sf.mlw"
-      loclnum="129" loccnumb="6" loccnume="17"
+      loclnum="127" loccnumb="6" loccnume="17"
       expl="precondition"
       sum="04881c12c158b2ab53ea063e7c05c3e2"
       proved="true"
@@ -251,7 +251,7 @@
      <goal
       name="WP_parameter list_member.3"
       locfile="programs/sf/../sf.mlw"
-      loclnum="129" loccnumb="6" loccnume="17"
+      loclnum="127" loccnumb="6" loccnume="17"
       expl="precondition"
       sum="db42e11d886429628e708b29b96b819b"
       proved="true"
@@ -271,7 +271,7 @@
      <goal
       name="WP_parameter list_member.4"
       locfile="programs/sf/../sf.mlw"
-      loclnum="129" loccnumb="6" loccnume="17"
+      loclnum="127" loccnumb="6" loccnume="17"
       expl="loop invariant preservation"
       sum="c3eb3677613f7faaeda2bc8dc0270211"
       proved="true"
@@ -286,7 +286,7 @@
        <goal
         name="WP_parameter list_member.4.1"
         locfile="programs/sf/../sf.mlw"
-        loclnum="129" loccnumb="6" loccnume="17"
+        loclnum="127" loccnumb="6" loccnume="17"
         expl="parameter list_member"
         sum="46be6cf76545a3c3be4ca3fe32f48b0c"
         proved="true"
@@ -306,7 +306,7 @@
        <goal
         name="WP_parameter list_member.4.2"
         locfile="programs/sf/../sf.mlw"
-        loclnum="129" loccnumb="6" loccnume="17"
+        loclnum="127" loccnumb="6" loccnume="17"
         expl="parameter list_member"
         sum="1eb545da7d3679710008c21e55a17c76"
         proved="true"
@@ -326,7 +326,7 @@
        <goal
         name="WP_parameter list_member.4.3"
         locfile="programs/sf/../sf.mlw"
-        loclnum="129" loccnumb="6" loccnume="17"
+        loclnum="127" loccnumb="6" loccnume="17"
         expl="parameter list_member"
         sum="06a3edc250676b000b1446a8ddd6ec68"
         proved="true"
@@ -348,16 +348,16 @@
      <goal
       name="WP_parameter list_member.5"
       locfile="programs/sf/../sf.mlw"
-      loclnum="129" loccnumb="6" loccnume="17"
-      expl="loop variant decreases"
-      sum="fab48b193b4ac362096a1ed9ca51c19a"
+      loclnum="127" loccnumb="6" loccnume="17"
+      expl="loop variant decrease"
+      sum="838fdcb80f93bceb519a9bb4cd748410"
       proved="true"
       expanded="true"
-      shape="ainfix &lt;alengthV8alengthV4Aainfix &lt;=c0alengthV4Iainfix =V8V7FICV4aNilfaConswVainfix =V7V9FIainfix =V4aNilNIainfix =V6c1FIainfix =V0V5ICV4aNilfaConsVwainfix =V5V10FIainfix =V4aNilNIainfix =V4aNilNIamemV0V4IamemV0V1Aainfix =V3c0OamemV0V1Aainfix =V3c1AamemV0V1IamemV0V4Aainfix &lt;=alengthV4alengthV1FIainfix =V2c0FFF">
+      shape="CV4aNilfaConswVainfix =V9V8Iainfix =V8V7FICV4aNilfaConswVainfix =V7V10FIainfix =V4aNilNIainfix =V6c1FIainfix =V0V5ICV4aNilfaConsVwainfix =V5V11FIainfix =V4aNilNIainfix =V4aNilNIamemV0V4IamemV0V1Aainfix =V3c0OamemV0V1Aainfix =V3c1AamemV0V1IamemV0V4Aainfix &lt;=alengthV4alengthV1FIainfix =V2c0FFF">
       <label
        name="expl:parameter list_member"/>
       <proof
-       prover="0"
+       prover="1"
        timelimit="10"
        memlimit="0"
        obsolete="false"
@@ -368,7 +368,7 @@
      <goal
       name="WP_parameter list_member.6"
       locfile="programs/sf/../sf.mlw"
-      loclnum="129" loccnumb="6" loccnume="17"
+      loclnum="127" loccnumb="6" loccnume="17"
       expl="precondition"
       sum="4461b8085ad1e9401d1980a3514207d6"
       proved="true"
@@ -388,7 +388,7 @@
      <goal
       name="WP_parameter list_member.7"
       locfile="programs/sf/../sf.mlw"
-      loclnum="129" loccnumb="6" loccnume="17"
+      loclnum="127" loccnumb="6" loccnume="17"
       expl="loop invariant preservation"
       sum="f061f3e47daeeae067d79127583cf87b"
       proved="true"
@@ -403,7 +403,7 @@
        <goal
         name="WP_parameter list_member.7.1"
         locfile="programs/sf/../sf.mlw"
-        loclnum="129" loccnumb="6" loccnume="17"
+        loclnum="127" loccnumb="6" loccnume="17"
         expl="parameter list_member"
         sum="2ceb0e51b746c578f577fc41d05f347f"
         proved="true"
@@ -423,7 +423,7 @@
        <goal
         name="WP_parameter list_member.7.2"
         locfile="programs/sf/../sf.mlw"
-        loclnum="129" loccnumb="6" loccnume="17"
+        loclnum="127" loccnumb="6" loccnume="17"
         expl="parameter list_member"
         sum="f27695d20368a6339cbbd56f90b3d85f"
         proved="true"
@@ -443,7 +443,7 @@
        <goal
         name="WP_parameter list_member.7.3"
         locfile="programs/sf/../sf.mlw"
-        loclnum="129" loccnumb="6" loccnume="17"
+        loclnum="127" loccnumb="6" loccnume="17"
         expl="parameter list_member"
         sum="96a1965e3dd2688634e8650ab7b24af1"
         proved="true"
@@ -465,16 +465,16 @@
      <goal
       name="WP_parameter list_member.8"
       locfile="programs/sf/../sf.mlw"
-      loclnum="129" loccnumb="6" loccnume="17"
-      expl="loop variant decreases"
-      sum="55064eda0411250c4761bcd55f80cf8f"
+      loclnum="127" loccnumb="6" loccnume="17"
+      expl="loop variant decrease"
+      sum="87807dc0b3397c108154fd4acd2cd80d"
       proved="true"
       expanded="true"
-      shape="ainfix &lt;alengthV7alengthV4Aainfix &lt;=c0alengthV4Iainfix =V7V6FICV4aNilfaConswVainfix =V6V8FIainfix =V4aNilNIainfix =V0V5NICV4aNilfaConsVwainfix =V5V9FIainfix =V4aNilNIainfix =V4aNilNIamemV0V4IamemV0V1Aainfix =V3c0OamemV0V1Aainfix =V3c1AamemV0V1IamemV0V4Aainfix &lt;=alengthV4alengthV1FIainfix =V2c0FFF">
+      shape="CV4aNilfaConswVainfix =V8V7Iainfix =V7V6FICV4aNilfaConswVainfix =V6V9FIainfix =V4aNilNIainfix =V0V5NICV4aNilfaConsVwainfix =V5V10FIainfix =V4aNilNIainfix =V4aNilNIamemV0V4IamemV0V1Aainfix =V3c0OamemV0V1Aainfix =V3c1AamemV0V1IamemV0V4Aainfix &lt;=alengthV4alengthV1FIainfix =V2c0FFF">
       <label
        name="expl:parameter list_member"/>
       <proof
-       prover="1"
+       prover="0"
        timelimit="10"
        memlimit="0"
        obsolete="false"
@@ -485,8 +485,8 @@
      <goal
       name="WP_parameter list_member.9"
       locfile="programs/sf/../sf.mlw"
-      loclnum="129" loccnumb="6" loccnume="17"
-      expl="normal postcondition"
+      loclnum="127" loccnumb="6" loccnume="17"
+      expl="postcondition"
       sum="6ea899bbf6a113318fba7df0b88896db"
       proved="true"
       expanded="true"
diff --git a/examples/programs/snapshotable_trees.mlw b/examples/programs/snapshotable_trees.mlw
index 5f9d6d771516ec37926047453b26e942d490dcf5..1a5981a77c88eae2eb39e6337f603aa6fd2a295d 100644
--- a/examples/programs/snapshotable_trees.mlw
+++ b/examples/programs/snapshotable_trees.mlw
@@ -175,6 +175,7 @@ module Harness
      let s = snapshot t in
      let it = iterator s in
      while hasNext it do
+       invariant { bst t.tree }
        variant { length (elements it) }
        let x = next it in
        let _ = add t (x * 3) in
diff --git a/examples/programs/snapshotable_trees/why3session.xml b/examples/programs/snapshotable_trees/why3session.xml
index 9efd411b4c8304ad7730859f9b38fc932eaeea97..107ec04a30ae2c72c0e4b5851c1afa837ad8b2d1 100644
--- a/examples/programs/snapshotable_trees/why3session.xml
+++ b/examples/programs/snapshotable_trees/why3session.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
- name="programs/snapshotable_trees/why3session.xml" shape_version="2">
+ name="examples/programs/snapshotable_trees/why3session.xml" shape_version="2">
  <prover
   id="0"
   name="Alt-Ergo"
@@ -12,26 +12,26 @@
   expanded="true">
   <theory
    name="Tree"
-   locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
+   locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
    loclnum="12" loccnumb="7" loccnume="11"
    verified="true"
    expanded="false">
   </theory>
   <theory
    name="Enum"
-   locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
+   locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
    loclnum="39" loccnumb="7" loccnume="11"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter enum"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
     loclnum="52" loccnumb="10" loccnume="14"
-    expl="normal postcondition"
-    sum="edc4629f2e763edb835a643f93cc3966"
+    expl="parameter enum"
+    sum="2dbd9bad190db50115826d2520aec25c"
     proved="true"
     expanded="true"
-    shape="CV0aEmptyainfix =aenum_elementsV1ainfix ++atree_elementsV0aenum_elementsV1aNodeVVVainfix =aenum_elementsV5ainfix ++atree_elementsV0aenum_elementsV1Iainfix =aenum_elementsV5ainfix ++atree_elementsV2aenum_elementsaNextV3V4V1FAainfix &lt;alengthatree_elementsV2alengthatree_elementsV0Aainfix &lt;=c0alengthatree_elementsV0F">
+    shape="CV0aEmptyainfix =aenum_elementsV1ainfix ++atree_elementsV0aenum_elementsV1aNodeVVVainfix =aenum_elementsV5ainfix ++atree_elementsV0aenum_elementsV1Iainfix =aenum_elementsV5ainfix ++atree_elementsV2aenum_elementsaNextV3V4V1FACV0aEmptyfaNodeVwVainfix =V7V2Oainfix =V6V2F">
     <label
      name="expl:parameter enum"/>
     <transf
@@ -40,9 +40,9 @@
      expanded="true">
      <goal
       name="WP_parameter enum.1"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
       loclnum="52" loccnumb="10" loccnume="14"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="44e5ef80dea96bd3d6cb23302863a0cf"
       proved="true"
       expanded="false"
@@ -60,13 +60,13 @@
      </goal>
      <goal
       name="WP_parameter enum.2"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
       loclnum="52" loccnumb="10" loccnume="14"
-      expl="variant decreases"
-      sum="2228b418c7f887c1ca1acddc694f23c8"
+      expl="variant decrease"
+      sum="58034422b45ca21cf28ae5ff8210fe28"
       proved="true"
       expanded="false"
-      shape="CV0aEmptytaNodeVVVainfix &lt;alengthatree_elementsV2alengthatree_elementsV0Aainfix &lt;=c0alengthatree_elementsV0F">
+      shape="CV0aEmptytaNodeVVVCV0aEmptyfaNodeVwVainfix =V6V2Oainfix =V5V2F">
       <label
        name="expl:parameter enum"/>
       <proof
@@ -80,9 +80,9 @@
      </goal>
      <goal
       name="WP_parameter enum.3"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
       loclnum="52" loccnumb="10" loccnume="14"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="9ea3990ea7741a0711cad3198c8c497b"
       proved="true"
       expanded="false"
@@ -103,15 +103,15 @@
   </theory>
   <theory
    name="Iterator"
-   locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-   loclnum="64" loccnumb="7" loccnume="15"
+   locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+   loclnum="63" loccnumb="7" loccnume="15"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter create_iterator"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="73" loccnumb="6" loccnume="21"
-    expl="normal postcondition"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="72" loccnumb="6" loccnume="21"
+    expl="postcondition"
     sum="f3c7559f0c9b1008dafcaa2d430844f4"
     proved="true"
     expanded="false"
@@ -129,9 +129,9 @@
    </goal>
    <goal
     name="WP_parameter hasNext"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="80" loccnumb="6" loccnume="13"
-    expl="normal postcondition"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="78" loccnumb="6" loccnume="13"
+    expl="postcondition"
     sum="69b11db99413186099c6f67c6d56c3b7"
     proved="true"
     expanded="false"
@@ -149,9 +149,9 @@
    </goal>
    <goal
     name="WP_parameter next"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="85" loccnumb="6" loccnume="10"
-    expl="normal postcondition"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="82" loccnumb="6" loccnume="10"
+    expl="postcondition"
     sum="0508818e14d859af825ea510d22fac43"
     proved="true"
     expanded="false"
@@ -170,15 +170,15 @@
   </theory>
   <theory
    name="BSTree"
-   locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-   loclnum="97" loccnumb="7" loccnume="13"
+   locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+   loclnum="94" loccnumb="7" loccnume="13"
    verified="true"
    expanded="false">
    <goal
     name="WP_parameter bst_mem"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="113" loccnumb="10" loccnume="17"
-    expl="normal postcondition"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="110" loccnumb="10" loccnume="17"
+    expl="parameter bst_mem"
     sum="4215efc8a5d4ba195327f1bda2c46d55"
     proved="true"
     expanded="false"
@@ -196,9 +196,9 @@
    </goal>
    <goal
     name="WP_parameter bst_add"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="126" loccnumb="10" loccnume="17"
-    expl="normal postcondition"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="122" loccnumb="10" loccnume="17"
+    expl="parameter bst_add"
     sum="47136d9ae8af6efbff6bab090ec142c5"
     proved="true"
     expanded="false"
@@ -217,16 +217,16 @@
   </theory>
   <theory
    name="ITree"
-   locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-   loclnum="143" loccnumb="7" loccnume="12"
+   locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+   loclnum="139" loccnumb="7" loccnume="12"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter create"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="152" loccnumb="6" loccnume="12"
-    expl="normal postcondition"
-    sum="0de11f55bd660f0fcf8965937e25b4e9"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="146" loccnumb="6" loccnume="12"
+    expl="parameter create"
+    sum="2444daba9b26ada7e2a9b95a41e7d201"
     proved="true"
     expanded="false"
     shape="abstaEmpty">
@@ -243,10 +243,10 @@
    </goal>
    <goal
     name="WP_parameter contains"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="157" loccnumb="6" loccnume="14"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="148" loccnumb="6" loccnume="14"
     expl="parameter contains"
-    sum="2b50d749859015b846b8bfe936e81066"
+    sum="ad98fec5d7d76c6128eb33b1f8e755de"
     proved="true"
     expanded="false"
     shape="amemV0V1qainfix =V2aTrueIamemV0V1qainfix =V2aTrueFAabstV1IabstV1FF">
@@ -263,13 +263,13 @@
    </goal>
    <goal
     name="WP_parameter add"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="162" loccnumb="6" loccnume="9"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="152" loccnumb="6" loccnume="9"
     expl="parameter add"
-    sum="563bbac5f17b9b61086e4a41f5e5bbc9"
+    sum="36a8581790072f77678b86d50a6b0309"
     proved="true"
     expanded="true"
-    shape="amemV2V1Oainfix =V2V0qamemV2V1FAamemV0V1AabstV1IamemV0V1AamemV5V1Oainfix =V5V0qamemV5V4FAamemV0V1NAabstV4Iainfix =V4V3FIamemV6V1Oainfix =V6V0qamemV6V3FAamemV0V1NAabstV3FAabstV1IabstV1FF">
+    shape="amemV2V1Oainfix =V2V0qamemV2V1FAamemV0V1IamemV0V1AabstV4AamemV5V1Oainfix =V5V0qamemV5V4FAamemV0V1NIainfix =V4V3FIamemV6V1Oainfix =V6V0qamemV6V3FAamemV0V1NAabstV3FAabstV1IabstV1FF">
     <label
      name="expl:parameter add"/>
     <transf
@@ -278,10 +278,10 @@
      expanded="true">
      <goal
       name="WP_parameter add.1"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="162" loccnumb="6" loccnume="9"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="152" loccnumb="6" loccnume="9"
       expl="precondition"
-      sum="19f0429120ee50ddc07a2d9875d8d661"
+      sum="e1078f5b5f76132b9e4a20ee139f6b64"
       proved="true"
       expanded="false"
       shape="abstV1IabstV1FF">
@@ -298,13 +298,13 @@
      </goal>
      <goal
       name="WP_parameter add.2"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="162" loccnumb="6" loccnume="9"
-      expl="normal postcondition"
-      sum="8f6f74df8443fcdabd840197adb19496"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="152" loccnumb="6" loccnume="9"
+      expl="postcondition"
+      sum="458c41cad7ff20cc12b59313f43380d8"
       proved="true"
       expanded="true"
-      shape="amemV4V1Oainfix =V4V0qamemV4V3FAamemV0V1NAabstV3Iainfix =V3V2FIamemV5V1Oainfix =V5V0qamemV5V2FAamemV0V1NAabstV2FIabstV1IabstV1FF">
+      shape="amemV4V1Oainfix =V4V0qamemV4V3FAamemV0V1NIainfix =V3V2FIamemV5V1Oainfix =V5V0qamemV5V2FAamemV0V1NAabstV2FIabstV1IabstV1FF">
       <label
        name="expl:parameter add"/>
       <transf
@@ -313,30 +313,10 @@
        expanded="true">
        <goal
         name="WP_parameter add.2.1"
-        locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-        loclnum="162" loccnumb="6" loccnume="9"
-        expl="parameter add"
-        sum="4bef8c5d52650dbdc51b703fdfaca915"
-        proved="true"
-        expanded="false"
-        shape="abstV3Iainfix =V3V2FIamemV4V1Oainfix =V4V0qamemV4V2FAamemV0V1NAabstV2FIabstV1IabstV1FF">
-        <label
-         name="expl:parameter add"/>
-        <proof
-         prover="0"
-         timelimit="10"
-         memlimit="0"
-         obsolete="false"
-         archived="false">
-         <result status="valid" time="0.01"/>
-        </proof>
-       </goal>
-       <goal
-        name="WP_parameter add.2.2"
-        locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-        loclnum="162" loccnumb="6" loccnume="9"
+        locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+        loclnum="152" loccnumb="6" loccnume="9"
         expl="parameter add"
-        sum="0668d8a8f3002974bd691a7acb5143ee"
+        sum="444ee3aee0698c0be2a476b57ce439a1"
         proved="true"
         expanded="false"
         shape="amemV0V1NIainfix =V3V2FIamemV4V1Oainfix =V4V0qamemV4V2FAamemV0V1NAabstV2FIabstV1IabstV1FF">
@@ -352,11 +332,11 @@
         </proof>
        </goal>
        <goal
-        name="WP_parameter add.2.3"
-        locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-        loclnum="162" loccnumb="6" loccnume="9"
+        name="WP_parameter add.2.2"
+        locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+        loclnum="152" loccnumb="6" loccnume="9"
         expl="parameter add"
-        sum="652bfa13b3389ecf75308ebe4e85332a"
+        sum="1c3ae76f64eaa630c0957c6de54563fb"
         proved="true"
         expanded="false"
         shape="amemV4V1Oainfix =V4V0IamemV4V3FIainfix =V3V2FIamemV5V1Oainfix =V5V0qamemV5V2FAamemV0V1NAabstV2FIabstV1IabstV1FF">
@@ -372,11 +352,11 @@
         </proof>
        </goal>
        <goal
-        name="WP_parameter add.2.4"
-        locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-        loclnum="162" loccnumb="6" loccnume="9"
+        name="WP_parameter add.2.3"
+        locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+        loclnum="152" loccnumb="6" loccnume="9"
         expl="parameter add"
-        sum="692350316e3192a9ca146b4abfe5aa22"
+        sum="efe7503f342404978c0247472962abfa"
         proved="true"
         expanded="false"
         shape="amemV4V3IamemV4V1Oainfix =V4V0FIainfix =V3V2FIamemV5V1Oainfix =V5V0qamemV5V2FAamemV0V1NAabstV2FIabstV1IabstV1FF">
@@ -395,13 +375,33 @@
      </goal>
      <goal
       name="WP_parameter add.3"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="162" loccnumb="6" loccnume="9"
-      expl="normal postcondition"
-      sum="ffea8eeb082d2726406d10bcfd95493f"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="152" loccnumb="6" loccnume="9"
+      expl="parameter add"
+      sum="6b4f1d1a3de78d3808362dddd7bf222c"
+      proved="true"
+      expanded="false"
+      shape="abstV3IamemV4V1Oainfix =V4V0qamemV4V3FAamemV0V1NIainfix =V3V2FIamemV5V1Oainfix =V5V0qamemV5V2FAamemV0V1NAabstV2FIabstV1IabstV1FF">
+      <label
+       name="expl:parameter add"/>
+      <proof
+       prover="0"
+       timelimit="5"
+       memlimit="1000"
+       obsolete="false"
+       archived="false">
+       <result status="valid" time="0.02"/>
+      </proof>
+     </goal>
+     <goal
+      name="WP_parameter add.4"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="152" loccnumb="6" loccnume="9"
+      expl="postcondition"
+      sum="79c457d6cee2fba977e937f2e0edf9f5"
       proved="true"
       expanded="false"
-      shape="amemV2V1Oainfix =V2V0qamemV2V1FAamemV0V1AabstV1IamemV0V1IabstV1IabstV1FF">
+      shape="amemV2V1Oainfix =V2V0qamemV2V1FAamemV0V1IamemV0V1IabstV1IabstV1FF">
       <label
        name="expl:parameter add"/>
       <proof
@@ -417,13 +417,13 @@
    </goal>
    <goal
     name="WP_parameter snapshot"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="170" loccnumb="6" loccnume="14"
-    expl="normal postcondition"
-    sum="38aca5f6dff38921dc64cde323bc1adb"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="157" loccnumb="6" loccnume="14"
+    expl="parameter snapshot"
+    sum="8d8112f215fcb392403ede56f480046c"
     proved="true"
     expanded="false"
-    shape="abstV0IabstV0F">
+    shape="t">
     <label
      name="expl:parameter snapshot"/>
     <proof
@@ -437,10 +437,10 @@
    </goal>
    <goal
     name="WP_parameter iterator"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="175" loccnumb="6" loccnume="14"
-    expl="normal postcondition"
-    sum="f0659bca8e8609a439a3cb37b1389d61"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="159" loccnumb="6" loccnume="14"
+    expl="postcondition"
+    sum="816e971a1cd366c57f641ea0cba45d6b"
     proved="true"
     expanded="false"
     shape="ainfix =aenum_elementsV1atree_elementsV0Iainfix =aenum_elementsV1atree_elementsV0FIabstV0F">
@@ -458,19 +458,19 @@
   </theory>
   <theory
    name="Harness"
-   locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-   loclnum="182" loccnumb="7" loccnume="14"
+   locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+   loclnum="165" loccnumb="7" loccnume="14"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter test"
-    locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-    loclnum="186" loccnumb="6" loccnume="10"
+    locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+    loclnum="169" loccnumb="6" loccnume="10"
     expl="parameter test"
-    sum="e430c2f9aa517b00375176aaba699fde"
+    sum="67cf168d216cd321980d53c0933a4d63"
     proved="true"
     expanded="true"
-    shape="ainfix &lt;alengthaenum_elementsV12alengthaenum_elementsV9Aainfix &lt;=c0alengthaenum_elementsV9AabstV14IamemV16V10Oainfix =V16ainfix *V13c3qamemV16V14FAamemainfix *V13c3V10qainfix =V15aFalseAabstV14FFAabstV10Iainfix =aenum_elementsV9aConsV13aenum_elementsV12FFAainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FAabstV5Iainfix =aenum_elementsV8atree_elementsV7FAabstV7IabstV7FAabstV5Aamemc2V5IamemV17V3Oainfix =V17c3qamemV17V5FAamemc3V3qainfix =V6aFalseAabstV5FFAabstV3IamemV18V1Oainfix =V18c2qamemV18V3FAamemc2V1qainfix =V4aFalseAabstV3FFAabstV1IamemV19V0Oainfix =V19c1qamemV19V1FAamemc1V0qainfix =V2aFalseAabstV1FFAabstV0IabstV0F">
+    shape="ainfix &lt;alengthaenum_elementsV12alengthaenum_elementsV9Aainfix &lt;=c0alengthaenum_elementsV9AabstV14IabstV14AamemV16V10Oainfix =V16ainfix *V13c3qamemV16V14FAamemainfix *V13c3V10qainfix =V15aFalseFFAabstV10Iainfix =aenum_elementsV9aConsV13aenum_elementsV12FFAainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FAabstV5Iainfix =aenum_elementsV8atree_elementsV7FIabstV7FAamemc2V5IabstV5AamemV17V3Oainfix =V17c3qamemV17V5FAamemc3V3qainfix =V6aFalseFFIabstV3AamemV18V1Oainfix =V18c2qamemV18V3FAamemc2V1qainfix =V4aFalseFFIabstV1AamemV19V0Oainfix =V19c1qamemV19V1FAamemc1V0qainfix =V2aFalseFFIabstV0F">
     <label
      name="expl:parameter test"/>
     <transf
@@ -479,13 +479,13 @@
      expanded="true">
      <goal
       name="WP_parameter test.1"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
-      expl="precondition"
-      sum="8628b30376ec4b408321c36c56b12481"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="169" loccnumb="6" loccnume="10"
+      expl="assertion"
+      sum="217f0f1cc62f3c8f65fbe79790b0583a"
       proved="true"
       expanded="false"
-      shape="abstV0IabstV0F">
+      shape="amemc2V5IabstV5AamemV7V3Oainfix =V7c3qamemV7V5FAamemc3V3qainfix =V6aFalseFFIabstV3AamemV8V1Oainfix =V8c2qamemV8V3FAamemc2V1qainfix =V4aFalseFFIabstV1AamemV9V0Oainfix =V9c1qamemV9V1FAamemc1V0qainfix =V2aFalseFFIabstV0F">
       <label
        name="expl:parameter test"/>
       <proof
@@ -494,38 +494,38 @@
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.02"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter test.2"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
-      expl="precondition"
-      sum="d6b5e8752a27f198766bd41dc7ad8ceb"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="169" loccnumb="6" loccnume="10"
+      expl="loop invariant init"
+      sum="3b2acdbadfc5d37b1b86a6c9040e1d6b"
       proved="true"
       expanded="false"
-      shape="abstV1IamemV3V0Oainfix =V3c1qamemV3V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
+      shape="abstV5Iainfix =aenum_elementsV8atree_elementsV7FIabstV7FIamemc2V5IabstV5AamemV9V3Oainfix =V9c3qamemV9V5FAamemc3V3qainfix =V6aFalseFFIabstV3AamemV10V1Oainfix =V10c2qamemV10V3FAamemc2V1qainfix =V4aFalseFFIabstV1AamemV11V0Oainfix =V11c1qamemV11V1FAamemc1V0qainfix =V2aFalseFFIabstV0F">
       <label
        name="expl:parameter test"/>
       <proof
        prover="0"
-       timelimit="10"
-       memlimit="0"
+       timelimit="5"
+       memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.00"/>
+       <result status="valid" time="0.01"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter test.3"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="169" loccnumb="6" loccnume="10"
       expl="precondition"
-      sum="976c69db2604f23b440635d8b389f6d5"
+      sum="4b07769f2b9370be7905730a5b89113d"
       proved="true"
       expanded="false"
-      shape="abstV3IamemV5V1Oainfix =V5c2qamemV5V3FAamemc2V1qainfix =V4aFalseAabstV3FFIabstV1IamemV6V0Oainfix =V6c1qamemV6V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
+      shape="ainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FIainfix =aenum_elementsV8atree_elementsV7FIabstV7FIamemc2V5IabstV5AamemV12V3Oainfix =V12c3qamemV12V5FAamemc3V3qainfix =V6aFalseFFIabstV3AamemV13V1Oainfix =V13c2qamemV13V3FAamemc2V1qainfix =V4aFalseFFIabstV1AamemV14V0Oainfix =V14c1qamemV14V1FAamemc1V0qainfix =V2aFalseFFIabstV0F">
       <label
        name="expl:parameter test"/>
       <proof
@@ -539,19 +539,19 @@
      </goal>
      <goal
       name="WP_parameter test.4"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
-      expl="assertion"
-      sum="e8c3d02b4ed2c3e660724cb866ff5bfe"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="169" loccnumb="6" loccnume="10"
+      expl="parameter test"
+      sum="3aad964ee1789afdcb8e88633524d166"
       proved="true"
       expanded="false"
-      shape="amemc2V5IamemV7V3Oainfix =V7c3qamemV7V5FAamemc3V3qainfix =V6aFalseAabstV5FFIabstV3IamemV8V1Oainfix =V8c2qamemV8V3FAamemc2V1qainfix =V4aFalseAabstV3FFIabstV1IamemV9V0Oainfix =V9c1qamemV9V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
+      shape="abstV10Iainfix =aenum_elementsV9aConsV13aenum_elementsV12FFIainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FIainfix =aenum_elementsV8atree_elementsV7FIabstV7FIamemc2V5IabstV5AamemV14V3Oainfix =V14c3qamemV14V5FAamemc3V3qainfix =V6aFalseFFIabstV3AamemV15V1Oainfix =V15c2qamemV15V3FAamemc2V1qainfix =V4aFalseFFIabstV1AamemV16V0Oainfix =V16c1qamemV16V1FAamemc1V0qainfix =V2aFalseFFIabstV0F">
       <label
        name="expl:parameter test"/>
       <proof
        prover="0"
-       timelimit="10"
-       memlimit="0"
+       timelimit="5"
+       memlimit="1000"
        obsolete="false"
        archived="false">
        <result status="valid" time="0.02"/>
@@ -559,133 +559,33 @@
      </goal>
      <goal
       name="WP_parameter test.5"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
-      expl="precondition"
-      sum="0282811bf58a1e891da5db3d8ec8c095"
-      proved="true"
-      expanded="false"
-      shape="abstV5Iamemc2V5IamemV7V3Oainfix =V7c3qamemV7V5FAamemc3V3qainfix =V6aFalseAabstV5FFIabstV3IamemV8V1Oainfix =V8c2qamemV8V3FAamemc2V1qainfix =V4aFalseAabstV3FFIabstV1IamemV9V0Oainfix =V9c1qamemV9V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
-      <label
-       name="expl:parameter test"/>
-      <proof
-       prover="0"
-       timelimit="10"
-       memlimit="0"
-       obsolete="false"
-       archived="false">
-       <result status="valid" time="0.02"/>
-      </proof>
-     </goal>
-     <goal
-      name="WP_parameter test.6"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
-      expl="precondition"
-      sum="d7f366556f4c905f20f0c138ddc895d4"
-      proved="true"
-      expanded="false"
-      shape="abstV7IabstV7FIabstV5Iamemc2V5IamemV8V3Oainfix =V8c3qamemV8V5FAamemc3V3qainfix =V6aFalseAabstV5FFIabstV3IamemV9V1Oainfix =V9c2qamemV9V3FAamemc2V1qainfix =V4aFalseAabstV3FFIabstV1IamemV10V0Oainfix =V10c1qamemV10V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
-      <label
-       name="expl:parameter test"/>
-      <proof
-       prover="0"
-       timelimit="10"
-       memlimit="0"
-       obsolete="false"
-       archived="false">
-       <result status="valid" time="0.01"/>
-      </proof>
-     </goal>
-     <goal
-      name="WP_parameter test.7"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
-      expl="loop invariant init"
-      sum="4eaba58e842d12e6f6ff2f980622d971"
-      proved="true"
-      expanded="false"
-      shape="abstV5Iainfix =aenum_elementsV8atree_elementsV7FIabstV7IabstV7FIabstV5Iamemc2V5IamemV9V3Oainfix =V9c3qamemV9V5FAamemc3V3qainfix =V6aFalseAabstV5FFIabstV3IamemV10V1Oainfix =V10c2qamemV10V3FAamemc2V1qainfix =V4aFalseAabstV3FFIabstV1IamemV11V0Oainfix =V11c1qamemV11V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
-      <label
-       name="expl:parameter test"/>
-      <proof
-       prover="0"
-       timelimit="10"
-       memlimit="0"
-       obsolete="false"
-       archived="false">
-       <result status="valid" time="0.03"/>
-      </proof>
-     </goal>
-     <goal
-      name="WP_parameter test.8"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
-      expl="precondition"
-      sum="45d78384b8818af58dc9ff09251385c4"
-      proved="true"
-      expanded="false"
-      shape="ainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FIainfix =aenum_elementsV8atree_elementsV7FIabstV7IabstV7FIabstV5Iamemc2V5IamemV12V3Oainfix =V12c3qamemV12V5FAamemc3V3qainfix =V6aFalseAabstV5FFIabstV3IamemV13V1Oainfix =V13c2qamemV13V3FAamemc2V1qainfix =V4aFalseAabstV3FFIabstV1IamemV14V0Oainfix =V14c1qamemV14V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
-      <label
-       name="expl:parameter test"/>
-      <proof
-       prover="0"
-       timelimit="10"
-       memlimit="0"
-       obsolete="false"
-       archived="false">
-       <result status="valid" time="0.02"/>
-      </proof>
-     </goal>
-     <goal
-      name="WP_parameter test.9"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
-      expl="precondition"
-      sum="7440806c25cd5df171ccea9535bca2d0"
-      proved="true"
-      expanded="false"
-      shape="abstV10Iainfix =aenum_elementsV9aConsV13aenum_elementsV12FFIainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FIainfix =aenum_elementsV8atree_elementsV7FIabstV7IabstV7FIabstV5Iamemc2V5IamemV14V3Oainfix =V14c3qamemV14V5FAamemc3V3qainfix =V6aFalseAabstV5FFIabstV3IamemV15V1Oainfix =V15c2qamemV15V3FAamemc2V1qainfix =V4aFalseAabstV3FFIabstV1IamemV16V0Oainfix =V16c1qamemV16V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
-      <label
-       name="expl:parameter test"/>
-      <proof
-       prover="0"
-       timelimit="10"
-       memlimit="0"
-       obsolete="false"
-       archived="false">
-       <result status="valid" time="0.02"/>
-      </proof>
-     </goal>
-     <goal
-      name="WP_parameter test.10"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="169" loccnumb="6" loccnume="10"
       expl="loop invariant preservation"
-      sum="58ade49990f3d89b6cfcd8e5af5d3f71"
+      sum="79c4dab9741fbdc4bf6d04589c2502a3"
       proved="true"
       expanded="false"
-      shape="abstV14IamemV16V10Oainfix =V16ainfix *V13c3qamemV16V14FAamemainfix *V13c3V10qainfix =V15aFalseAabstV14FFIabstV10Iainfix =aenum_elementsV9aConsV13aenum_elementsV12FFIainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FIainfix =aenum_elementsV8atree_elementsV7FIabstV7IabstV7FIabstV5Iamemc2V5IamemV17V3Oainfix =V17c3qamemV17V5FAamemc3V3qainfix =V6aFalseAabstV5FFIabstV3IamemV18V1Oainfix =V18c2qamemV18V3FAamemc2V1qainfix =V4aFalseAabstV3FFIabstV1IamemV19V0Oainfix =V19c1qamemV19V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
+      shape="abstV14IabstV14AamemV16V10Oainfix =V16ainfix *V13c3qamemV16V14FAamemainfix *V13c3V10qainfix =V15aFalseFFIabstV10Iainfix =aenum_elementsV9aConsV13aenum_elementsV12FFIainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FIainfix =aenum_elementsV8atree_elementsV7FIabstV7FIamemc2V5IabstV5AamemV17V3Oainfix =V17c3qamemV17V5FAamemc3V3qainfix =V6aFalseFFIabstV3AamemV18V1Oainfix =V18c2qamemV18V3FAamemc2V1qainfix =V4aFalseFFIabstV1AamemV19V0Oainfix =V19c1qamemV19V1FAamemc1V0qainfix =V2aFalseFFIabstV0F">
       <label
        name="expl:parameter test"/>
       <proof
        prover="0"
-       timelimit="10"
-       memlimit="0"
+       timelimit="5"
+       memlimit="1000"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.02"/>
+       <result status="valid" time="0.01"/>
       </proof>
      </goal>
      <goal
-      name="WP_parameter test.11"
-      locfile="programs/snapshotable_trees/../snapshotable_trees.mlw"
-      loclnum="186" loccnumb="6" loccnume="10"
-      expl="loop variant decreases"
-      sum="1b8bf8a13e08a345e209a098e22ff14e"
+      name="WP_parameter test.6"
+      locfile="examples/programs/snapshotable_trees/../snapshotable_trees.mlw"
+      loclnum="169" loccnumb="6" loccnume="10"
+      expl="loop variant decrease"
+      sum="bf34d47835342615f7db424b33c809c4"
       proved="true"
       expanded="false"
-      shape="ainfix &lt;alengthaenum_elementsV12alengthaenum_elementsV9Aainfix &lt;=c0alengthaenum_elementsV9IamemV16V10Oainfix =V16ainfix *V13c3qamemV16V14FAamemainfix *V13c3V10qainfix =V15aFalseAabstV14FFIabstV10Iainfix =aenum_elementsV9aConsV13aenum_elementsV12FFIainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FIainfix =aenum_elementsV8atree_elementsV7FIabstV7IabstV7FIabstV5Iamemc2V5IamemV17V3Oainfix =V17c3qamemV17V5FAamemc3V3qainfix =V6aFalseAabstV5FFIabstV3IamemV18V1Oainfix =V18c2qamemV18V3FAamemc2V1qainfix =V4aFalseAabstV3FFIabstV1IamemV19V0Oainfix =V19c1qamemV19V1FAamemc1V0qainfix =V2aFalseAabstV1FFIabstV0IabstV0F">
+      shape="ainfix &lt;alengthaenum_elementsV12alengthaenum_elementsV9Aainfix &lt;=c0alengthaenum_elementsV9IabstV14AamemV16V10Oainfix =V16ainfix *V13c3qamemV16V14FAamemainfix *V13c3V10qainfix =V15aFalseFFIabstV10Iainfix =aenum_elementsV9aConsV13aenum_elementsV12FFIainfix =V9aDoneNIainfix =V11aTrueIainfix =V9aDoneNqainfix =V11aTrueFIabstV10FIainfix =aenum_elementsV8atree_elementsV7FIabstV7FIamemc2V5IabstV5AamemV17V3Oainfix =V17c3qamemV17V5FAamemc3V3qainfix =V6aFalseFFIabstV3AamemV18V1Oainfix =V18c2qamemV18V3FAamemc2V1qainfix =V4aFalseFFIabstV1AamemV19V0Oainfix =V19c1qamemV19V1FAamemc1V0qainfix =V2aFalseFFIabstV0F">
       <label
        name="expl:parameter test"/>
       <proof
diff --git a/examples/programs/vstte10_aqueue/why3session.xml b/examples/programs/vstte10_aqueue/why3session.xml
index 1cbeae79501c48bf15df140eb729d5b9d58d608d..896355b15c0b5c5d00ed52a0fd7547f68384d87a 100644
--- a/examples/programs/vstte10_aqueue/why3session.xml
+++ b/examples/programs/vstte10_aqueue/why3session.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE why3session SYSTEM "/users/demons/melquion/src/why3/share/why3session.dtd">
+<!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
  name="programs/vstte10_aqueue/why3session.xml" shape_version="2">
  <prover
@@ -19,12 +19,12 @@
    <goal
     name="WP_parameter empty"
     locfile="programs/vstte10_aqueue/../vstte10_aqueue.mlw"
-    loclnum="23" loccnumb="6" loccnume="11"
-    expl="normal postcondition"
-    sum="498d84262c30a9b2934c3bb7bcc44d5a"
+    loclnum="21" loccnumb="6" loccnume="11"
+    expl="parameter empty"
+    sum="e7190a3f05a3e5728d5182b6f3ff1850"
     proved="true"
     expanded="false"
-    shape="ainfix =ainfix ++aNilareverseaNilaNilAainvamk queueaNilc0aNilc0">
+    shape="ainfix =alengthV0c0Aainfix &gt;=c0alengthV0Aainfix =alengthaNilc0LaNilAainfix =ainfix ++aNilareverseaNilaNil">
     <label
      name="expl:parameter empty"/>
     <proof
@@ -39,12 +39,12 @@
    <goal
     name="WP_parameter head"
     locfile="programs/vstte10_aqueue/../vstte10_aqueue.mlw"
-    loclnum="28" loccnumb="6" loccnume="10"
-    expl="parameter head"
-    sum="64983e0baac48d883c036004ba40e21e"
+    loclnum="24" loccnumb="6" loccnume="10"
+    expl="postcondition"
+    sum="731d618ab885e13a385f070505c96178"
     proved="true"
     expanded="false"
-    shape="CV0aNilfaConsVwCainfix ++V0areverseV2aNilfaConsVwainfix =V4V5Iainfix =ainfix ++V0areverseV2aNilNAainvamk queueV0V1V2V3F">
+    shape="CV0aNilfaConsVwCainfix ++V0areverseV2aNilfaConsVwainfix =V4V5Iainfix =alengthV2V3Aainfix &gt;=V1alengthV2Aainfix =alengthV0V1Aainfix =ainfix ++V0areverseV2aNilNF">
     <label
      name="expl:parameter head"/>
     <proof
@@ -59,12 +59,12 @@
    <goal
     name="WP_parameter create"
     locfile="programs/vstte10_aqueue/../vstte10_aqueue.mlw"
-    loclnum="36" loccnumb="6" loccnume="12"
+    loclnum="32" loccnumb="6" loccnume="12"
     expl="parameter create"
-    sum="a165a71d9f58b13dbc4acbd82b56df31"
+    sum="e4493530dbb94b33806eb2a0070fdeca"
     proved="true"
     expanded="false"
-    shape="iainfix &gt;=V1V3ainfix =ainfix ++V0areverseV2ainfix ++V0areverseV2Aainvamk queueV0V1V2V3ainfix =ainfix ++ainfix ++V0areverseV2areverseaNilainfix ++V0areverseV2Aainvamk queueainfix ++V0areverseV2ainfix +V1V3aNilc0Iainfix =V3alengthV2Aainfix =V1alengthV0F">
+    shape="iainfix &gt;=V1V3ainfix =alengthV2V3Aainfix &gt;=V1alengthV2Aainfix =alengthV0V1Aainfix =ainfix ++V0areverseV2ainfix ++V0areverseV2ainfix =alengthV5c0Aainfix &gt;=V4alengthV5Aainfix =alengthainfix ++V0areverseV2V4LaNilLainfix +V1V3Aainfix =ainfix ++ainfix ++V0areverseV2areverseaNilainfix ++V0areverseV2Iainfix =V3alengthV2Aainfix =V1alengthV0F">
     <label
      name="expl:parameter create"/>
     <proof
@@ -73,18 +73,18 @@
      memlimit="0"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.26"/>
+     <result status="valid" time="0.06"/>
     </proof>
    </goal>
    <goal
     name="WP_parameter tail"
     locfile="programs/vstte10_aqueue/../vstte10_aqueue.mlw"
-    loclnum="45" loccnumb="6" loccnume="10"
+    loclnum="41" loccnumb="6" loccnume="10"
     expl="parameter tail"
-    sum="f3431d96040089e759a45554b314a269"
+    sum="a6440f8070a3a8534544700cdd6e4204"
     proved="true"
     expanded="false"
-    shape="CV0aNilfaConswVCainfix ++V0areverseV2aNilfaConswVainfix =ainfix ++V5areverseV7V10AainvV9Iainfix =ainfix ++V5areverseV7ainfix ++V4areverseV2AainvV9Lamk queueV5V6V7V8FAainfix =V3alengthV2Aainfix =ainfix -V1c1alengthV4Iainfix =ainfix ++V0areverseV2aNilNAainvamk queueV0V1V2V3F">
+    shape="CV0aNilfaConswVCainfix ++V0areverseV2aNilfaConswVainfix =ainfix ++V5areverseV7V9Iainfix =alengthV7V8Aainfix &gt;=V6alengthV7Aainfix =alengthV5V6Aainfix =ainfix ++V5areverseV7ainfix ++V4areverseV2FAainfix =V3alengthV2Aainfix =ainfix -V1c1alengthV4Iainfix =alengthV2V3Aainfix &gt;=V1alengthV2Aainfix =alengthV0V1Aainfix =ainfix ++V0areverseV2aNilNF">
     <label
      name="expl:parameter tail"/>
     <transf
@@ -94,12 +94,12 @@
      <goal
       name="WP_parameter tail.1"
       locfile="programs/vstte10_aqueue/../vstte10_aqueue.mlw"
-      loclnum="45" loccnumb="6" loccnume="10"
+      loclnum="41" loccnumb="6" loccnume="10"
       expl="parameter tail"
-      sum="4888cb9fe8cfdc43be348ddd8f842f70"
+      sum="010e43c61197c54d2ae7e9eaaeebe781"
       proved="true"
       expanded="false"
-      shape="CV0aNilfaConswVtIainfix =ainfix ++V0areverseV2aNilNAainvamk queueV0V1V2V3F">
+      shape="CV0aNilfaConswVtIainfix =alengthV2V3Aainfix &gt;=V1alengthV2Aainfix =alengthV0V1Aainfix =ainfix ++V0areverseV2aNilNF">
       <label
        name="expl:parameter tail"/>
       <proof
@@ -114,12 +114,12 @@
      <goal
       name="WP_parameter tail.2"
       locfile="programs/vstte10_aqueue/../vstte10_aqueue.mlw"
-      loclnum="45" loccnumb="6" loccnume="10"
-      expl="parameter tail"
-      sum="68931e7ee369bfa166975119600e3b21"
+      loclnum="41" loccnumb="6" loccnume="10"
+      expl="precondition"
+      sum="a193f4ad19553331fdb67d308fbb399e"
       proved="true"
       expanded="false"
-      shape="CV0aNiltaConswVainfix =V3alengthV2Aainfix =ainfix -V1c1alengthV4Iainfix =ainfix ++V0areverseV2aNilNAainvamk queueV0V1V2V3F">
+      shape="CV0aNiltaConswVainfix =V3alengthV2Aainfix =ainfix -V1c1alengthV4Iainfix =alengthV2V3Aainfix &gt;=V1alengthV2Aainfix =alengthV0V1Aainfix =ainfix ++V0areverseV2aNilNF">
       <label
        name="expl:parameter tail"/>
       <proof
@@ -134,12 +134,12 @@
      <goal
       name="WP_parameter tail.3"
       locfile="programs/vstte10_aqueue/../vstte10_aqueue.mlw"
-      loclnum="45" loccnumb="6" loccnume="10"
-      expl="parameter tail"
-      sum="e3cd38003adee97315e3cf49b49723ab"
+      loclnum="41" loccnumb="6" loccnume="10"
+      expl="postcondition"
+      sum="f1c01d477137a0eeb89dd49b58ab0d01"
       proved="true"
       expanded="false"
-      shape="CV0aNiltaConswVCainfix ++V0areverseV2aNilfaConswVainfix =ainfix ++V5areverseV7V10AainvV9Iainfix =ainfix ++V5areverseV7ainfix ++V4areverseV2AainvV9Lamk queueV5V6V7V8FIainfix =V3alengthV2Aainfix =ainfix -V1c1alengthV4Iainfix =ainfix ++V0areverseV2aNilNAainvamk queueV0V1V2V3F">
+      shape="CV0aNiltaConswVCainfix ++V0areverseV2aNilfaConswVainfix =ainfix ++V5areverseV7V9Iainfix =alengthV7V8Aainfix &gt;=V6alengthV7Aainfix =alengthV5V6Aainfix =ainfix ++V5areverseV7ainfix ++V4areverseV2FIainfix =V3alengthV2Aainfix =ainfix -V1c1alengthV4Iainfix =alengthV2V3Aainfix &gt;=V1alengthV2Aainfix =alengthV0V1Aainfix =ainfix ++V0areverseV2aNilNF">
       <label
        name="expl:parameter tail"/>
       <proof
@@ -148,7 +148,7 @@
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.26"/>
+       <result status="valid" time="0.12"/>
       </proof>
      </goal>
     </transf>
@@ -156,12 +156,12 @@
    <goal
     name="WP_parameter enqueue"
     locfile="programs/vstte10_aqueue/../vstte10_aqueue.mlw"
-    loclnum="53" loccnumb="6" loccnume="13"
+    loclnum="49" loccnumb="6" loccnume="13"
     expl="parameter enqueue"
-    sum="75784486f186bfc210e481f8526ecff3"
+    sum="a5041cec8b908b9416f27b032df60668"
     proved="true"
     expanded="false"
-    shape="ainfix =ainfix ++V5areverseV7ainfix ++ainfix ++V1areverseV3aConsV0aNilAainvV9Iainfix =ainfix ++V5areverseV7ainfix ++V1areverseaConsV0V3AainvV9Lamk queueV5V6V7V8FAainfix =ainfix +V4c1alengthaConsV0V3Aainfix =V2alengthV1Iainvamk queueV1V2V3V4F">
+    shape="ainfix =ainfix ++V5areverseV7ainfix ++ainfix ++V1areverseV3aConsV0aNilIainfix =alengthV7V8Aainfix &gt;=V6alengthV7Aainfix =alengthV5V6Aainfix =ainfix ++V5areverseV7ainfix ++V1areverseaConsV0V3FAainfix =ainfix +V4c1alengthaConsV0V3Aainfix =V2alengthV1Iainfix =alengthV3V4Aainfix &gt;=V2alengthV3Aainfix =alengthV1V2F">
     <label
      name="expl:parameter enqueue"/>
     <proof
diff --git a/examples/programs/vstte10_search_list/why3session.xml b/examples/programs/vstte10_search_list/why3session.xml
index 56178d053120d8fdaec9d412ae22e3afd889dfba..a6f986dd6aafa6edfe8cce8c14934143e4e50b18 100644
--- a/examples/programs/vstte10_search_list/why3session.xml
+++ b/examples/programs/vstte10_search_list/why3session.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE why3session SYSTEM "/users/demons/melquion/src/why3/share/why3session.dtd">
+<!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
  name="programs/vstte10_search_list/why3session.xml" shape_version="2">
  <prover
@@ -37,34 +37,34 @@
     locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
     loclnum="22" loccnumb="10" loccnume="16"
     expl="parameter search"
-    sum="be70f08352e985e4851d3bd34e28942e"
+    sum="69d2acf8c21bc7bf9c054c98f813d956"
     proved="true"
     expanded="false"
-    shape="CV1aNilano_zeroV1Aainfix =V0ainfix +V0alengthV1Oazero_atV1ainfix -V0V0Aainfix &lt;V0ainfix +V0alengthV1Aainfix &lt;=V0V0aConsVViainfix =V2c0ano_zeroV1Aainfix =V0ainfix +V0alengthV1Oazero_atV1ainfix -V0V0Aainfix &lt;V0ainfix +V0alengthV1Aainfix &lt;=V0V0ano_zeroV1Aainfix =V4ainfix +V0alengthV1Oazero_atV1ainfix -V4V0Aainfix &lt;V4ainfix +V0alengthV1Aainfix &lt;=V0V4Iano_zeroV3Aainfix =V4ainfix +ainfix +V0c1alengthV3Oazero_atV3ainfix -V4ainfix +V0c1Aainfix &lt;V4ainfix +ainfix +V0c1alengthV3Aainfix &lt;=ainfix +V0c1V4FAainfix &lt;alengthV3alengthV1Aainfix &lt;=c0alengthV1F">
+    shape="CV1aNilano_zeroV1Aainfix =V0ainfix +V0alengthV1Oazero_atV1ainfix -V0V0Aainfix &lt;V0ainfix +V0alengthV1Aainfix &lt;=V0V0aConsVViainfix =V2c0ano_zeroV1Aainfix =V0ainfix +V0alengthV1Oazero_atV1ainfix -V0V0Aainfix &lt;V0ainfix +V0alengthV1Aainfix &lt;=V0V0ano_zeroV1Aainfix =V4ainfix +V0alengthV1Oazero_atV1ainfix -V4V0Aainfix &lt;V4ainfix +V0alengthV1Aainfix &lt;=V0V4Iano_zeroV3Aainfix =V4ainfix +ainfix +V0c1alengthV3Oazero_atV3ainfix -V4ainfix +V0c1Aainfix &lt;V4ainfix +ainfix +V0c1alengthV3Aainfix &lt;=ainfix +V0c1V4FACV1aNilfaConswVainfix =V5V3F">
     <label
      name="expl:parameter search"/>
     <proof
-     prover="1"
-     timelimit="5"
+     prover="0"
+     timelimit="20"
      memlimit="0"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.37"/>
+     <result status="valid" time="0.07"/>
     </proof>
     <proof
-     prover="0"
-     timelimit="20"
+     prover="1"
+     timelimit="5"
      memlimit="0"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.07"/>
+     <result status="valid" time="0.37"/>
     </proof>
    </goal>
    <goal
     name="WP_parameter search_list"
     locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-    loclnum="32" loccnumb="6" loccnume="17"
-    expl="normal postcondition"
+    loclnum="30" loccnumb="6" loccnume="17"
+    expl="postcondition"
     sum="11a1d721023cedaa322a809ac3dbf939"
     proved="true"
     expanded="false"
@@ -72,12 +72,12 @@
     <label
      name="expl:parameter search_list"/>
     <proof
-     prover="4"
-     timelimit="5"
+     prover="0"
+     timelimit="20"
      memlimit="0"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.00"/>
+     <result status="valid" time="0.01"/>
     </proof>
     <proof
      prover="1"
@@ -88,19 +88,19 @@
      <result status="valid" time="0.00"/>
     </proof>
     <proof
-     prover="0"
-     timelimit="20"
+     prover="4"
+     timelimit="5"
      memlimit="0"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.01"/>
+     <result status="valid" time="0.00"/>
     </proof>
    </goal>
    <goal
     name="WP_parameter head"
     locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-    loclnum="45" loccnumb="6" loccnume="10"
-    expl="parameter head"
+    loclnum="41" loccnumb="6" loccnume="10"
+    expl="postcondition"
     sum="31b8df7d3f63fec07357c189da91a8b0"
     proved="true"
     expanded="false"
@@ -108,12 +108,12 @@
     <label
      name="expl:parameter head"/>
     <proof
-     prover="4"
-     timelimit="5"
+     prover="0"
+     timelimit="20"
      memlimit="0"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.01"/>
+     <result status="valid" time="0.00"/>
     </proof>
     <proof
      prover="1"
@@ -124,19 +124,19 @@
      <result status="valid" time="0.01"/>
     </proof>
     <proof
-     prover="0"
-     timelimit="20"
+     prover="4"
+     timelimit="5"
      memlimit="0"
      obsolete="false"
      archived="false">
-     <result status="valid" time="0.00"/>
+     <result status="valid" time="0.01"/>
     </proof>
    </goal>
    <goal
     name="WP_parameter tail"
     locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-    loclnum="50" loccnumb="6" loccnume="10"
-    expl="parameter tail"
+    loclnum="45" loccnumb="6" loccnume="10"
+    expl="postcondition"
     sum="31c56ef51e1ec3648824041e6cc87e7c"
     proved="true"
     expanded="false"
@@ -144,8 +144,8 @@
     <label
      name="expl:parameter tail"/>
     <proof
-     prover="4"
-     timelimit="5"
+     prover="0"
+     timelimit="20"
      memlimit="0"
      obsolete="false"
      archived="false">
@@ -160,8 +160,8 @@
      <result status="valid" time="0.01"/>
     </proof>
     <proof
-     prover="0"
-     timelimit="20"
+     prover="4"
+     timelimit="5"
      memlimit="0"
      obsolete="false"
      archived="false">
@@ -171,12 +171,12 @@
    <goal
     name="WP_parameter search_loop"
     locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-    loclnum="55" loccnumb="6" loccnume="17"
+    loclnum="49" loccnumb="6" loccnume="17"
     expl="parameter search_loop"
-    sum="4d65fa470b4fb0ab2579e013d20724d2"
+    sum="3d60e8abc03c314bfa44202ee2ede658"
     proved="true"
     expanded="true"
-    shape="iainfix =V1aNilNiainfix =V3c0Nainfix &lt;alengthV6alengthV1Aainfix &lt;=c0alengthV1Aainfix =anthV7V0aSomec0NIainfix &lt;V7V4Aainfix &lt;=c0V7FAainfix =anthV8V6anthainfix +V4V8V0Iainfix &lt;=c0V8FAainfix =ainfix +V4alengthV6alengthV0Aainfix &lt;=c0V4Iainfix =V6V5FICV1aNilfaConswVainfix =V5V9FAainfix =V1aNilNIainfix =V4ainfix +V2c1Fano_zeroV0Aainfix =V2alengthV0Oazero_atV0V2Aainfix &lt;V2alengthV0Aainfix &lt;=c0V2ICV1aNilfaConsVwainfix =V3V10FAainfix =V1aNilNano_zeroV0Aainfix =V2alengthV0Oazero_atV0V2Aainfix &lt;V2alengthV0Aainfix &lt;=c0V2Iainfix =anthV11V0aSomec0NIainfix &lt;V11V2Aainfix &lt;=c0V11FAainfix =anthV12V1anthainfix +V2V12V0Iainfix &lt;=c0V12FAainfix =ainfix +V2alengthV1alengthV0Aainfix &lt;=c0V2FAainfix =anthV13V0aSomec0NIainfix &lt;V13c0Aainfix &lt;=c0V13FAainfix =anthV14V0anthainfix +c0V14V0Iainfix &lt;=c0V14FAainfix =ainfix +c0alengthV0alengthV0Aainfix &lt;=c0c0F">
+    shape="iainfix =V1aNilNiainfix =V3c0NCV1aNilfaConswVainfix =V7V6Aainfix =anthV8V0aSomec0NIainfix &lt;V8V4Aainfix &lt;=c0V8FAainfix =anthV9V6anthainfix +V4V9V0Iainfix &lt;=c0V9FAainfix =ainfix +V4alengthV6alengthV0Aainfix &lt;=c0V4Iainfix =V6V5FICV1aNilfaConswVainfix =V5V10FAainfix =V1aNilNIainfix =V4ainfix +V2c1Fano_zeroV0Aainfix =V2alengthV0Oazero_atV0V2Aainfix &lt;V2alengthV0Aainfix &lt;=c0V2ICV1aNilfaConsVwainfix =V3V11FAainfix =V1aNilNano_zeroV0Aainfix =V2alengthV0Oazero_atV0V2Aainfix &lt;V2alengthV0Aainfix &lt;=c0V2Iainfix =anthV12V0aSomec0NIainfix &lt;V12V2Aainfix &lt;=c0V12FAainfix =anthV13V1anthainfix +V2V13V0Iainfix &lt;=c0V13FAainfix =ainfix +V2alengthV1alengthV0Aainfix &lt;=c0V2FAainfix =anthV14V0aSomec0NIainfix &lt;V14c0Aainfix &lt;=c0V14FAainfix =anthV15V0anthainfix +c0V15V0Iainfix &lt;=c0V15FAainfix =ainfix +c0alengthV0alengthV0Aainfix &lt;=c0c0F">
     <label
      name="expl:parameter search_loop"/>
     <transf
@@ -186,7 +186,7 @@
      <goal
       name="WP_parameter search_loop.1"
       locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-      loclnum="55" loccnumb="6" loccnume="17"
+      loclnum="49" loccnumb="6" loccnume="17"
       expl="loop invariant init"
       sum="e3ba8ac50b2ae174d5dd44d48b685090"
       proved="true"
@@ -195,12 +195,12 @@
       <label
        name="expl:parameter search_loop"/>
       <proof
-       prover="4"
-       timelimit="5"
+       prover="0"
+       timelimit="20"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.00"/>
+       <result status="valid" time="0.01"/>
       </proof>
       <proof
        prover="1"
@@ -211,18 +211,18 @@
        <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="0"
-       timelimit="20"
+       prover="4"
+       timelimit="5"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.00"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter search_loop.2"
       locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-      loclnum="55" loccnumb="6" loccnume="17"
+      loclnum="49" loccnumb="6" loccnume="17"
       expl="precondition"
       sum="bc23ceb4f845e4b37543d1cce882395f"
       proved="true"
@@ -231,34 +231,34 @@
       <label
        name="expl:parameter search_loop"/>
       <proof
-       prover="4"
+       prover="0"
        timelimit="5"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.00"/>
+       <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="0"
-       timelimit="5"
+       prover="1"
+       timelimit="20"
        memlimit="0"
        obsolete="false"
        archived="false">
        <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="1"
-       timelimit="20"
+       prover="4"
+       timelimit="5"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.00"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter search_loop.3"
       locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-      loclnum="55" loccnumb="6" loccnume="17"
+      loclnum="49" loccnumb="6" loccnume="17"
       expl="precondition"
       sum="b49ec582136d232cd8a0bcf82ecca138"
       proved="true"
@@ -267,12 +267,12 @@
       <label
        name="expl:parameter search_loop"/>
       <proof
-       prover="4"
-       timelimit="5"
+       prover="0"
+       timelimit="20"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.02"/>
+       <result status="valid" time="0.01"/>
       </proof>
       <proof
        prover="1"
@@ -283,18 +283,18 @@
        <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="0"
-       timelimit="20"
+       prover="4"
+       timelimit="5"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.02"/>
       </proof>
      </goal>
      <goal
       name="WP_parameter search_loop.4"
       locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-      loclnum="55" loccnumb="6" loccnume="17"
+      loclnum="49" loccnumb="6" loccnume="17"
       expl="loop invariant preservation"
       sum="88f184b307eee5c312d835bac2b20515"
       proved="true"
@@ -309,7 +309,7 @@
        <goal
         name="WP_parameter search_loop.4.1"
         locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-        loclnum="55" loccnumb="6" loccnume="17"
+        loclnum="49" loccnumb="6" loccnume="17"
         expl="parameter search_loop"
         sum="b77f39e2ef88fe7ab20c073b9ac78176"
         proved="true"
@@ -318,12 +318,12 @@
         <label
          name="expl:parameter search_loop"/>
         <proof
-         prover="4"
-         timelimit="5"
+         prover="0"
+         timelimit="20"
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.02"/>
+         <result status="valid" time="0.01"/>
         </proof>
         <proof
          prover="1"
@@ -334,18 +334,18 @@
          <result status="valid" time="0.02"/>
         </proof>
         <proof
-         prover="0"
-         timelimit="20"
+         prover="4"
+         timelimit="5"
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.01"/>
+         <result status="valid" time="0.02"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter search_loop.4.2"
         locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-        loclnum="55" loccnumb="6" loccnume="17"
+        loclnum="49" loccnumb="6" loccnume="17"
         expl="parameter search_loop"
         sum="8ce03252b3af8aafe2d7eaa4d53143d4"
         proved="true"
@@ -354,8 +354,8 @@
         <label
          name="expl:parameter search_loop"/>
         <proof
-         prover="4"
-         timelimit="5"
+         prover="0"
+         timelimit="20"
          memlimit="0"
          obsolete="false"
          archived="false">
@@ -370,8 +370,8 @@
          <result status="valid" time="0.02"/>
         </proof>
         <proof
-         prover="0"
-         timelimit="20"
+         prover="4"
+         timelimit="5"
          memlimit="0"
          obsolete="false"
          archived="false">
@@ -381,7 +381,7 @@
        <goal
         name="WP_parameter search_loop.4.3"
         locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-        loclnum="55" loccnumb="6" loccnume="17"
+        loclnum="49" loccnumb="6" loccnume="17"
         expl="parameter search_loop"
         sum="9a6759626a45137f52447df5d8992b55"
         proved="true"
@@ -402,7 +402,7 @@
        <goal
         name="WP_parameter search_loop.4.4"
         locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-        loclnum="55" loccnumb="6" loccnume="17"
+        loclnum="49" loccnumb="6" loccnume="17"
         expl="parameter search_loop"
         sum="3867a51c9de920f120d33632dc9b0f7d"
         proved="true"
@@ -425,25 +425,25 @@
      <goal
       name="WP_parameter search_loop.5"
       locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-      loclnum="55" loccnumb="6" loccnume="17"
-      expl="loop variant decreases"
-      sum="8b4d5c814b05baacfd1c193d89f77688"
+      loclnum="49" loccnumb="6" loccnume="17"
+      expl="loop variant decrease"
+      sum="8b649db939dfbee308e383a877ce600f"
       proved="true"
       expanded="true"
-      shape="ainfix &lt;alengthV6alengthV1Aainfix &lt;=c0alengthV1Iainfix =V6V5FICV1aNilfaConswVainfix =V5V7FIainfix =V1aNilNIainfix =V4ainfix +V2c1FIainfix =V3c0NICV1aNilfaConsVwainfix =V3V8FIainfix =V1aNilNIainfix =V1aNilNIainfix =anthV9V0aSomec0NIainfix &lt;V9V2Aainfix &lt;=c0V9FAainfix =anthV10V1anthainfix +V2V10V0Iainfix &lt;=c0V10FAainfix =ainfix +V2alengthV1alengthV0Aainfix &lt;=c0V2FF">
+      shape="CV1aNilfaConswVainfix =V7V6Iainfix =V6V5FICV1aNilfaConswVainfix =V5V8FIainfix =V1aNilNIainfix =V4ainfix +V2c1FIainfix =V3c0NICV1aNilfaConsVwainfix =V3V9FIainfix =V1aNilNIainfix =V1aNilNIainfix =anthV10V0aSomec0NIainfix &lt;V10V2Aainfix &lt;=c0V10FAainfix =anthV11V1anthainfix +V2V11V0Iainfix &lt;=c0V11FAainfix =ainfix +V2alengthV1alengthV0Aainfix &lt;=c0V2FF">
       <label
        name="expl:parameter search_loop"/>
       <proof
-       prover="1"
-       timelimit="5"
+       prover="0"
+       timelimit="20"
        memlimit="0"
        obsolete="false"
        archived="false">
        <result status="valid" time="0.01"/>
       </proof>
       <proof
-       prover="0"
-       timelimit="20"
+       prover="1"
+       timelimit="5"
        memlimit="0"
        obsolete="false"
        archived="false">
@@ -461,8 +461,8 @@
      <goal
       name="WP_parameter search_loop.6"
       locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-      loclnum="55" loccnumb="6" loccnume="17"
-      expl="normal postcondition"
+      loclnum="49" loccnumb="6" loccnume="17"
+      expl="postcondition"
       sum="04f3cfbddd7d18113f4133fe72dd9dae"
       proved="true"
       expanded="true"
@@ -482,8 +482,8 @@
      <goal
       name="WP_parameter search_loop.7"
       locfile="programs/vstte10_search_list/../vstte10_search_list.mlw"
-      loclnum="55" loccnumb="6" loccnume="17"
-      expl="normal postcondition"
+      loclnum="49" loccnumb="6" loccnume="17"
+      expl="postcondition"
       sum="01e92de2ee5d72a93c10b5ef0d547174"
       proved="true"
       expanded="true"
@@ -491,12 +491,12 @@
       <label
        name="expl:parameter search_loop"/>
       <proof
-       prover="4"
-       timelimit="5"
+       prover="0"
+       timelimit="20"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.02"/>
+       <result status="valid" time="0.01"/>
       </proof>
       <proof
        prover="1"
@@ -507,12 +507,12 @@
        <result status="valid" time="0.02"/>
       </proof>
       <proof
-       prover="0"
-       timelimit="20"
+       prover="4"
+       timelimit="5"
        memlimit="0"
        obsolete="false"
        archived="false">
-       <result status="valid" time="0.01"/>
+       <result status="valid" time="0.02"/>
       </proof>
      </goal>
     </transf>
diff --git a/examples/programs/vstte12_bfs/why3session.xml b/examples/programs/vstte12_bfs/why3session.xml
index f3dd6fcdbd1d74862638c9776c8d9f0ebb80c3dd..7cb9aa928665271d509e6dc8fa87b67f24c605d9 100644
--- a/examples/programs/vstte12_bfs/why3session.xml
+++ b/examples/programs/vstte12_bfs/why3session.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE why3session SYSTEM "/home/marche/why3/share/why3session.dtd">
+<!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
- name="programs/vstte12_bfs/why3session.xml" shape_version="2">
+ name="examples/programs/vstte12_bfs/why3session.xml" shape_version="2">
  <prover
   id="0"
   name="Alt-Ergo"
@@ -24,15 +24,15 @@
   expanded="false">
   <theory
    name="Graph"
-   locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+   locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
    loclnum="8" loccnumb="7" loccnume="12"
    verified="true"
    expanded="false">
    <goal
     name="path_nonneg"
-    locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+    locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
     loclnum="26" loccnumb="8" loccnume="19"
-    sum="79fa28a0bd80a544e7d9e1839f10bfbd"
+    sum="57529f5cd39140e0be6819fe790a4f2b"
     proved="true"
     expanded="false"
     shape="ainfix &gt;=V2c0IapathV0V1V2F">
@@ -48,9 +48,9 @@
    </goal>
    <goal
     name="path_inversion"
-    locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+    locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
     loclnum="30" loccnumb="8" loccnume="22"
-    sum="b14dea0726537e9ca43b39857f0417af"
+    sum="c22a388ac33b9f80c5ff0d885c7a7262"
     proved="true"
     expanded="false"
     shape="amemV1asuccV3AapathV0V3V2EIapathV0V1ainfix +V2c1Iainfix &gt;=V2c0F">
@@ -66,9 +66,9 @@
    </goal>
    <goal
     name="path_closure"
-    locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+    locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
     loclnum="36" loccnumb="8" loccnume="20"
-    sum="ef402bb2f01dfe3e13fc45a70e24474c"
+    sum="7dbdddd1410d07f076993f6ad952b8f3"
     proved="true"
     expanded="false"
     shape="amemV2V0IamemV1V0IapathV1V2V3FIamemV5V0IamemV5asuccV4FIamemV4V0FF">
@@ -85,16 +85,16 @@
   </theory>
   <theory
    name="BFS"
-   locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+   locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
    loclnum="49" loccnumb="7" loccnume="10"
    verified="false"
    expanded="true">
    <goal
     name="WP_parameter fill_next"
-    locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+    locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
     loclnum="82" loccnumb="6" loccnume="15"
     expl="parameter fill_next"
-    sum="31745b6c4b86c993be4fb6baac23e524"
+    sum="77e82e10540de437c2832560158050ad"
     proved="false"
     expanded="true"
     shape="iainfix =V10aTrueNiamemV12V9NaclosureV13V5V14V15Iainfix =V15V2NFAasubsetadiffasuccV2V11V13AasubsetV11asuccV2AainvV0V1V13V5V14V3Iainfix =V14aaddV12V8FIainfix =V13aaddV12V9FaclosureV9V5V8V16Iainfix =V16V2NFAasubsetadiffasuccV2V11V9AasubsetV11asuccV2AainvV0V1V9V5V8V3Iainfix =V11aremoveV12V7AamemV12V7FFAais_emptyV7NaclosureV9V5V8V17FAasubsetasuccV2V9AainvV0V1V9V5V8V3Iais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V18Iainfix =V18V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FAaclosureV6V5V4V19Iainfix =V19V2NFAasubsetadiffasuccV2asuccV2V6AasubsetasuccV2asuccV2AainvV0V1V6V5V4V3IaclosureV6V5V4V20Iainfix =V20V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -106,10 +106,10 @@
      expanded="true">
      <goal
       name="WP_parameter fill_next.1"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="82" loccnumb="6" loccnume="15"
       expl="loop invariant init"
-      sum="73ce6850c8980fe483e0356331d5329a"
+      sum="570828a3e5533a9b5b7b18d431902c6d"
       proved="true"
       expanded="false"
       shape="aclosureV6V5V4V7Iainfix =V7V2NFAasubsetadiffasuccV2asuccV2V6AasubsetasuccV2asuccV2AainvV0V1V6V5V4V3IaclosureV6V5V4V8Iainfix =V8V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -126,10 +126,10 @@
      </goal>
      <goal
       name="WP_parameter fill_next.2"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="82" loccnumb="6" loccnume="15"
       expl="precondition"
-      sum="903825ecb2144dcd115a16fcd84a2e83"
+      sum="ac054aba845f470a8a621b083e551e7d"
       proved="true"
       expanded="false"
       shape="ais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V11Iainfix =V11V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V12Iainfix =V12V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -146,10 +146,10 @@
      </goal>
      <goal
       name="WP_parameter fill_next.3"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="82" loccnumb="6" loccnume="15"
       expl="loop invariant preservation"
-      sum="7ae12aa0d2957a04732f21e24aa4edf7"
+      sum="3b174112dd920b5971a452e1270869b3"
       proved="true"
       expanded="true"
       shape="aclosureV13V5V14V15Iainfix =V15V2NFAasubsetadiffasuccV2V11V13AasubsetV11asuccV2AainvV0V1V13V5V14V3Iainfix =V14aaddV12V8FIainfix =V13aaddV12V9FIamemV12V9NIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V16Iainfix =V16V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V17Iainfix =V17V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -161,10 +161,10 @@
        expanded="true">
        <goal
         name="WP_parameter fill_next.3.1"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="7dc02bcb9edcd3abaab3df4ced166d5b"
+        sum="b3b230b9b75e06d5c36a87f9736000dd"
         proved="true"
         expanded="false"
         shape="ainvV0V1V13V5V14V3Iainfix =V14aaddV12V8FIainfix =V13aaddV12V9FIamemV12V9NIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V15Iainfix =V15V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V16Iainfix =V16V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -176,15 +176,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="7.83"/>
+         <result status="valid" time="3.53"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter fill_next.3.2"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="1b887b8efd6c7975d79853dbfa331b67"
+        sum="34080246935dbb9053141713949de20b"
         proved="true"
         expanded="false"
         shape="asubsetV11asuccV2Iainfix =V14aaddV12V8FIainfix =V13aaddV12V9FIamemV12V9NIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V15Iainfix =V15V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V16Iainfix =V16V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -201,10 +201,10 @@
        </goal>
        <goal
         name="WP_parameter fill_next.3.3"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="5ed9d505e26b238fb8e709b69fa7b5ab"
+        sum="ec7169fcb33efbe4bba0b538ba1bd6d2"
         proved="true"
         expanded="false"
         shape="asubsetadiffasuccV2V11V13Iainfix =V14aaddV12V8FIainfix =V13aaddV12V9FIamemV12V9NIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V15Iainfix =V15V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V16Iainfix =V16V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -221,10 +221,10 @@
        </goal>
        <goal
         name="WP_parameter fill_next.3.4"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="45016b24c457bb4677b9cfc74ce2b938"
+        sum="14e6894e392588e34b56c840bdc8784d"
         proved="true"
         expanded="false"
         shape="aclosureV13V5V14V15Iainfix =V15V2NFIainfix =V14aaddV12V8FIainfix =V13aaddV12V9FIamemV12V9NIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V16Iainfix =V16V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V17Iainfix =V17V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -243,10 +243,10 @@
      </goal>
      <goal
       name="WP_parameter fill_next.4"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="82" loccnumb="6" loccnume="15"
       expl="loop invariant preservation"
-      sum="aca8a54d7ad77584079824ef21d4f836"
+      sum="213dfeb01efdc4e82f685483f0142e85"
       proved="false"
       expanded="true"
       shape="aclosureV9V5V8V13Iainfix =V13V2NFAasubsetadiffasuccV2V11V9AasubsetV11asuccV2AainvV0V1V9V5V8V3IamemV12V9NNIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V14Iainfix =V14V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V15Iainfix =V15V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -258,10 +258,10 @@
        expanded="true">
        <goal
         name="WP_parameter fill_next.4.1"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="e569d7dfaf2dac12bdf06b2d65ad16b4"
+        sum="958263dec5e808f8ab92179570001c96"
         proved="true"
         expanded="false"
         shape="ainvV0V1V9V5V8V3IamemV12V9NNIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V13Iainfix =V13V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V14Iainfix =V14V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -278,10 +278,10 @@
        </goal>
        <goal
         name="WP_parameter fill_next.4.2"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="4f3fe0f16fecacdb8b15abc7a1a5d0b3"
+        sum="47f6d86c4185c23b005de649172d5907"
         proved="false"
         expanded="false"
         shape="asubsetV11asuccV2IamemV12V9NNIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V13Iainfix =V13V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V14Iainfix =V14V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -290,10 +290,10 @@
        </goal>
        <goal
         name="WP_parameter fill_next.4.3"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="ebd6451e93b84bf3eb307d0ade594b63"
+        sum="b9286c7f43e370217929ee393a5d24e6"
         proved="true"
         expanded="false"
         shape="asubsetadiffasuccV2V11V9IamemV12V9NNIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V13Iainfix =V13V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V14Iainfix =V14V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -310,10 +310,10 @@
        </goal>
        <goal
         name="WP_parameter fill_next.4.4"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="0dbf57d2a697d541a91d50f251de97f8"
+        sum="1ca18b206e007c1026f90f9dd3d9af10"
         proved="true"
         expanded="true"
         shape="aclosureV9V5V8V13Iainfix =V13V2NFIamemV12V9NNIainfix =V11aremoveV12V7AamemV12V7FFIais_emptyV7NIainfix =V10aTrueNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V14Iainfix =V14V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V15Iainfix =V15V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -325,10 +325,10 @@
          expanded="true">
          <goal
           name="WP_parameter fill_next.4.4.1"
-          locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+          locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
           loclnum="82" loccnumb="6" loccnume="15"
           expl="parameter fill_next"
-          sum="c159eabf528e7427d3c26bf72bb5a4d8"
+          sum="cc7ba9581ff68d9f859154cb67691188"
           proved="true"
           expanded="false"
           shape="amemV14V9IamemV14asuccV13FIamemV13V8NIamemV13V5NIamemV13V9Iainfix =V13V2NFIamemV12V9NNIainfix =V11aremoveV12V7AamemV12V7FFIamemV15V7NFNIainfix =V10aTrueNIamemV16V7NFqainfix =V10aTrueFIamemV18V9IamemV18asuccV17FIamemV17V8NIamemV17V5NIamemV17V9Iainfix =V17V2NFAamemV19V9IamemV19adiffasuccV2V7FAamemV20asuccV2IamemV20V7FAamemV1V8OamemV1V5IamemV1V9AamemV21V9NOamemV21V8Iashortest_pathV0V21ainfix +V3c1FAainfix &lt;=V23ainfix +V3c1AapathV0V22V23EIamemV22V9FAamemV24V9Iainfix &lt;=V25V3IapathV0V24V25FAashortest_pathV0V26ainfix +V3c1IamemV26V8FAasubsetV8V9Aashortest_pathV0V27V3IamemV27V5FAasubsetV5V9FIamemV29V6IamemV29asuccV28FIamemV28V4NIamemV28V5NIamemV28V6Iainfix =V28V2NFAapathV0V2V30NIainfix &lt;V30V3FAapathV0V2V3AamemV1V4OamemV1V5IamemV1V6AamemV31V6NOamemV31V4Iashortest_pathV0V31ainfix +V3c1FAainfix &lt;=V33ainfix +V3c1AapathV0V32V33EIamemV32V6FAamemV34V6Iainfix &lt;=V35V3IapathV0V34V35FAashortest_pathV0V36ainfix +V3c1IamemV36V4FAasubsetV4V6Aashortest_pathV0V37V3IamemV37V5FAasubsetV5V6FF">
@@ -340,7 +340,7 @@
            memlimit="0"
            obsolete="false"
            archived="false">
-           <result status="valid" time="0.38"/>
+           <result status="valid" time="0.19"/>
           </proof>
          </goal>
         </transf>
@@ -349,10 +349,10 @@
      </goal>
      <goal
       name="WP_parameter fill_next.5"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="82" loccnumb="6" loccnume="15"
       expl="postcondition"
-      sum="7bb16c12e54fc2772685838deea79bb8"
+      sum="634d79769c0390e191624b0b3b8515bf"
       proved="true"
       expanded="true"
       shape="aclosureV9V5V8V11FAasubsetasuccV2V9AainvV0V1V9V5V8V3Iainfix =V10aTrueNNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V12Iainfix =V12V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V13Iainfix =V13V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -364,10 +364,10 @@
        expanded="true">
        <goal
         name="WP_parameter fill_next.5.1"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="4a609634c053bb134ef3f7454edd3be8"
+        sum="817a0386ba5daa2ccd6f575e4f772ac0"
         proved="true"
         expanded="false"
         shape="ainvV0V1V9V5V8V3Iainfix =V10aTrueNNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V11Iainfix =V11V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V12Iainfix =V12V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -384,10 +384,10 @@
        </goal>
        <goal
         name="WP_parameter fill_next.5.2"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="74332d9983b2d96dec8199e2cc4a9e24"
+        sum="f30995d51e31966bc50fbf020636b2ca"
         proved="true"
         expanded="false"
         shape="asubsetasuccV2V9Iainfix =V10aTrueNNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V11Iainfix =V11V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V12Iainfix =V12V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -399,15 +399,15 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="1.05"/>
+         <result status="valid" time="1.29"/>
         </proof>
        </goal>
        <goal
         name="WP_parameter fill_next.5.3"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="82" loccnumb="6" loccnume="15"
         expl="parameter fill_next"
-        sum="ba88cc390716930b2d1ac096367afc60"
+        sum="e09274b1c75b7ad8237c477c8bffea91"
         proved="true"
         expanded="false"
         shape="aclosureV9V5V8V11FIainfix =V10aTrueNNIais_emptyV7qainfix =V10aTrueFIaclosureV9V5V8V12Iainfix =V12V2NFAasubsetadiffasuccV2V7V9AasubsetV7asuccV2AainvV0V1V9V5V8V3FIaclosureV6V5V4V13Iainfix =V13V2NFAashortest_pathV0V2V3AainvV0V1V6V5V4V3FF">
@@ -419,7 +419,7 @@
          memlimit="0"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.38"/>
+         <result status="valid" time="0.53"/>
         </proof>
        </goal>
       </transf>
@@ -428,10 +428,10 @@
    </goal>
    <goal
     name="WP_parameter bfs"
-    locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+    locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
     loclnum="104" loccnumb="6" loccnume="9"
     expl="parameter bfs"
-    sum="3ed1616d32cb4f72f7cca8a22369491a"
+    sum="cf065ed7511ff80aa07e539656c68fdc"
     proved="true"
     expanded="true"
     shape="iainfix =V6aTrueNiainfix =V8V1ashortest_pathV0V1V2iainfix =V11aTrueainfix &lt;=c0V14AaclosureV10V12V13V15FAais_emptyV13Iais_emptyV12AainvV0V1V10V12V13V14Iainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9Fainfix &lt;=c0V2AaclosureV10V7V9V16FAais_emptyV9Iais_emptyV7AainvV0V1V10V7V9V2Iais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V17FAasubsetasuccV8V10AainvV0V1V10V7V9V2FAaclosureV5V7V3V18Iainfix =V18V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V7aremoveV8V4AamemV8V4FFAais_emptyV4NapathV0V1V19NFAamemV1V5NIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V20FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FAainfix &lt;=c0c0AaclosureasingletonV0asingletonV0aemptyV21FAais_emptyaemptyIais_emptyasingletonV0AainvV0V1asingletonV0asingletonV0aemptyc0F">
@@ -443,10 +443,10 @@
      expanded="true">
      <goal
       name="WP_parameter bfs.1"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="104" loccnumb="6" loccnume="9"
       expl="loop invariant init"
-      sum="137a0881252d3d22effe133b610740a9"
+      sum="c35343b5538c8b9db7919e55b7a4a833"
       proved="true"
       expanded="true"
       shape="ainfix &lt;=c0c0AaclosureasingletonV0asingletonV0aemptyV2FAais_emptyaemptyIais_emptyasingletonV0AainvV0V1asingletonV0asingletonV0aemptyc0F">
@@ -458,10 +458,10 @@
        expanded="true">
        <goal
         name="WP_parameter bfs.1.1"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="84ca72fe7149a071450c0071a9aa0ba3"
+        sum="b9d71e54a900772aceac6bc46477820c"
         proved="true"
         expanded="false"
         shape="ainvV0V1asingletonV0asingletonV0aemptyc0F">
@@ -478,10 +478,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.1.2"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="33ea4b859ea8a3d51d488cc33bb043e0"
+        sum="7980f7f4a171f449d2401f204d8d131c"
         proved="true"
         expanded="false"
         shape="ais_emptyaemptyIais_emptyasingletonV0F">
@@ -498,10 +498,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.1.3"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="fc730c99319c3d75da264e038dd4399c"
+        sum="7218e981aecd4a189e4d77ec543d28d8"
         proved="true"
         expanded="true"
         shape="aclosureasingletonV0asingletonV0aemptyV2FF">
@@ -513,10 +513,10 @@
          expanded="true">
          <goal
           name="WP_parameter bfs.1.3.1"
-          locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+          locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
           loclnum="104" loccnumb="6" loccnume="9"
           expl="parameter bfs"
-          sum="ced18c7247bd980ad17165f6d4ae8067"
+          sum="443bf90344294162dded0802c6bf0d8f"
           proved="true"
           expanded="false"
           shape="amemV3asingletonV0IamemV3asuccV2FIamemV2aemptyNIamemV2asingletonV0NIamemV2asingletonV0FF">
@@ -535,10 +535,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.1.4"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="df60d66975f7aebf9a74dede19862d47"
+        sum="f232acfc2448c2c48462c50815c376b6"
         proved="true"
         expanded="false"
         shape="ainfix &lt;=c0c0F">
@@ -557,10 +557,10 @@
      </goal>
      <goal
       name="WP_parameter bfs.2"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="104" loccnumb="6" loccnume="9"
       expl="precondition"
-      sum="101118ab43fc391c4b2cded990254c15"
+      sum="2eb7c3b30ea1884cd262cd4f7876ce34"
       proved="true"
       expanded="false"
       shape="ais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V7FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -577,10 +577,10 @@
      </goal>
      <goal
       name="WP_parameter bfs.3"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="104" loccnumb="6" loccnume="9"
       expl="exceptional postcondition"
-      sum="3045c0eed9bf41fdd9ee74217facf69e"
+      sum="37e5b377d9c11152213fb8fe7a8ebbb3"
       proved="true"
       expanded="false"
       shape="ashortest_pathV0V1V2Iainfix =V8V1Iainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V9FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -597,10 +597,10 @@
      </goal>
      <goal
       name="WP_parameter bfs.4"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="104" loccnumb="6" loccnume="9"
       expl="precondition"
-      sum="8c684545cc5b5e3d11ad22885c3d9252"
+      sum="fbb82b185f9517055bef2f56c56ba201"
       proved="true"
       expanded="true"
       shape="aclosureV5V7V3V9Iainfix =V9V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V10FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -612,10 +612,10 @@
        expanded="true">
        <goal
         name="WP_parameter bfs.4.1"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="d3d8414ad4fbc82646f704786636a424"
+        sum="a4c33fe929f480bb134a8a2bc6426e21"
         proved="true"
         expanded="false"
         shape="ainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V9FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -632,10 +632,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.4.2"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="8e7e3487e492a7746b86f099c9b157fe"
+        sum="3f421c44d56d80271698c5786462ad77"
         proved="true"
         expanded="false"
         shape="ashortest_pathV0V8V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V9FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -652,10 +652,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.4.3"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="ab7bf578cc7d3c5a63de6f78ac4335dd"
+        sum="0e50705054f714ef3cbcaa3b96220f61"
         proved="true"
         expanded="true"
         shape="aclosureV5V7V3V9Iainfix =V9V8NFIainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V10FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -667,10 +667,10 @@
          expanded="true">
          <goal
           name="WP_parameter bfs.4.3.1"
-          locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+          locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
           loclnum="104" loccnumb="6" loccnume="9"
           expl="parameter bfs"
-          sum="7fe8c2da48f33012188d4b5e73843c30"
+          sum="a14614e9c8b843f1fb0e87ab34b6d26a"
           proved="true"
           expanded="false"
           shape="amemV10V5IamemV10asuccV9FIamemV9V3NIamemV9V7NIamemV9V5Iainfix =V9V8NFIainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV11V4NFNIainfix =V6aTrueNIamemV12V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV14V5IamemV14asuccV13FIamemV13V3NIamemV13V4NIamemV13V5FAamemV15V3NFIamemV16V4NFAamemV1V3OamemV1V4IamemV1V5AamemV17V5NOamemV17V3Iashortest_pathV0V17ainfix +V2c1FAainfix &lt;=V19ainfix +V2c1AapathV0V18V19EIamemV18V5FAamemV20V5Iainfix &lt;=V21V2IapathV0V20V21FAashortest_pathV0V22ainfix +V2c1IamemV22V3FAasubsetV3V5Aashortest_pathV0V23V2IamemV23V4FAasubsetV4V5FF">
@@ -691,10 +691,10 @@
      </goal>
      <goal
       name="WP_parameter bfs.5"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="104" loccnumb="6" loccnume="9"
       expl="loop invariant preservation"
-      sum="1e11aae350a89f35cdf0af29bda434e3"
+      sum="3db2b145bd933b1488b7f2b824d2bfac"
       proved="true"
       expanded="true"
       shape="ainfix &lt;=c0V14AaclosureV10V12V13V15FAais_emptyV13Iais_emptyV12AainvV0V1V10V12V13V14Iainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V16FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V17Iainfix =V17V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V18FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -706,10 +706,10 @@
        expanded="true">
        <goal
         name="WP_parameter bfs.5.1"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="c82fbd22a32bd9ed4ab77e0b479dfc15"
+        sum="5ba46d4b5189ccd669b8f0a14b30af48"
         proved="true"
         expanded="true"
         shape="ainvV0V1V10V12V13V14Iainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V15FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V16Iainfix =V16V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V17FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -721,10 +721,10 @@
          expanded="true">
          <goal
           name="WP_parameter bfs.5.1.1"
-          locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+          locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
           loclnum="104" loccnumb="6" loccnume="9"
           expl="parameter bfs"
-          sum="52703e04456c16c2e2a365c5d12ac16c"
+          sum="bfaaa577879ba274768d7b77cf3a94fc"
           proved="true"
           expanded="true"
           shape="amemV1V13OamemV1V12IamemV1V10AamemV15V10NOamemV15V13Iashortest_pathV0V15ainfix +V14c1FAainfix &lt;=V17ainfix +V14c1AapathV0V16V17EIamemV16V10FAamemV18V10Iainfix &lt;=V19V14IapathV0V18V19FAashortest_pathV0V20ainfix +V14c1IamemV20V13FAasubsetV13V10Aashortest_pathV0V21V14IamemV21V12FAasubsetV12V10Iainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIamemV22V7NFqainfix =V11aTrueFIamemV24V10IamemV24asuccV23FIamemV23V9NIamemV23V7NIamemV23V10FAamemV25V10IamemV25asuccV8FAamemV1V9OamemV1V7IamemV1V10AamemV26V10NOamemV26V9Iashortest_pathV0V26ainfix +V2c1FAainfix &lt;=V28ainfix +V2c1AapathV0V27V28EIamemV27V10FAamemV29V10Iainfix &lt;=V30V2IapathV0V29V30FAashortest_pathV0V31ainfix +V2c1IamemV31V9FAasubsetV9V10Aashortest_pathV0V32V2IamemV32V7FAasubsetV7V10FIamemV34V5IamemV34asuccV33FIamemV33V3NIamemV33V7NIamemV33V5Iainfix =V33V8NFAapathV0V8V35NIainfix &lt;V35V2FAapathV0V8V2AamemV1V3OamemV1V7IamemV1V5AamemV36V5NOamemV36V3Iashortest_pathV0V36ainfix +V2c1FAainfix &lt;=V38ainfix +V2c1AapathV0V37V38EIamemV37V5FAamemV39V5Iainfix &lt;=V40V2IapathV0V39V40FAashortest_pathV0V41ainfix +V2c1IamemV41V3FAasubsetV3V5Aashortest_pathV0V42V2IamemV42V7FAasubsetV7V5Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV43V4NFNIainfix =V6aTrueNIamemV44V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV46V5IamemV46asuccV45FIamemV45V3NIamemV45V4NIamemV45V5FAamemV47V3NFIamemV48V4NFAamemV1V3OamemV1V4IamemV1V5AamemV49V5NOamemV49V3Iashortest_pathV0V49ainfix +V2c1FAainfix &lt;=V51ainfix +V2c1AapathV0V50V51EIamemV50V5FAamemV52V5Iainfix &lt;=V53V2IapathV0V52V53FAashortest_pathV0V54ainfix +V2c1IamemV54V3FAasubsetV3V5Aashortest_pathV0V55V2IamemV55V4FAasubsetV4V5FF">
@@ -736,10 +736,10 @@
            expanded="true">
            <goal
             name="WP_parameter bfs.5.1.1.1"
-            locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+            locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
             loclnum="104" loccnumb="6" loccnume="9"
             expl="parameter bfs"
-            sum="bee895155b5abfc1921ec701d03fb0c3"
+            sum="5a3f387870e42b3427456be536532dca"
             proved="true"
             expanded="false"
             shape="asubsetV12V10Iainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIamemV15V7NFqainfix =V11aTrueFIamemV17V10IamemV17asuccV16FIamemV16V9NIamemV16V7NIamemV16V10FAamemV18V10IamemV18asuccV8FAamemV1V9OamemV1V7IamemV1V10AamemV19V10NOamemV19V9Iashortest_pathV0V19ainfix +V2c1FAainfix &lt;=V21ainfix +V2c1AapathV0V20V21EIamemV20V10FAamemV22V10Iainfix &lt;=V23V2IapathV0V22V23FAashortest_pathV0V24ainfix +V2c1IamemV24V9FAasubsetV9V10Aashortest_pathV0V25V2IamemV25V7FAasubsetV7V10FIamemV27V5IamemV27asuccV26FIamemV26V3NIamemV26V7NIamemV26V5Iainfix =V26V8NFAapathV0V8V28NIainfix &lt;V28V2FAapathV0V8V2AamemV1V3OamemV1V7IamemV1V5AamemV29V5NOamemV29V3Iashortest_pathV0V29ainfix +V2c1FAainfix &lt;=V31ainfix +V2c1AapathV0V30V31EIamemV30V5FAamemV32V5Iainfix &lt;=V33V2IapathV0V32V33FAashortest_pathV0V34ainfix +V2c1IamemV34V3FAasubsetV3V5Aashortest_pathV0V35V2IamemV35V7FAasubsetV7V5Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV36V4NFNIainfix =V6aTrueNIamemV37V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV39V5IamemV39asuccV38FIamemV38V3NIamemV38V4NIamemV38V5FAamemV40V3NFIamemV41V4NFAamemV1V3OamemV1V4IamemV1V5AamemV42V5NOamemV42V3Iashortest_pathV0V42ainfix +V2c1FAainfix &lt;=V44ainfix +V2c1AapathV0V43V44EIamemV43V5FAamemV45V5Iainfix &lt;=V46V2IapathV0V45V46FAashortest_pathV0V47ainfix +V2c1IamemV47V3FAasubsetV3V5Aashortest_pathV0V48V2IamemV48V4FAasubsetV4V5FF">
@@ -756,10 +756,10 @@
            </goal>
            <goal
             name="WP_parameter bfs.5.1.1.2"
-            locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+            locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
             loclnum="104" loccnumb="6" loccnume="9"
             expl="parameter bfs"
-            sum="4fd9efc61a08435ffbd858f390f69230"
+            sum="6311467111246439580444dbb089be0f"
             proved="true"
             expanded="false"
             shape="ashortest_pathV0V15V14IamemV15V12FIainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIamemV16V7NFqainfix =V11aTrueFIamemV18V10IamemV18asuccV17FIamemV17V9NIamemV17V7NIamemV17V10FAamemV19V10IamemV19asuccV8FAamemV1V9OamemV1V7IamemV1V10AamemV20V10NOamemV20V9Iashortest_pathV0V20ainfix +V2c1FAainfix &lt;=V22ainfix +V2c1AapathV0V21V22EIamemV21V10FAamemV23V10Iainfix &lt;=V24V2IapathV0V23V24FAashortest_pathV0V25ainfix +V2c1IamemV25V9FAasubsetV9V10Aashortest_pathV0V26V2IamemV26V7FAasubsetV7V10FIamemV28V5IamemV28asuccV27FIamemV27V3NIamemV27V7NIamemV27V5Iainfix =V27V8NFAapathV0V8V29NIainfix &lt;V29V2FAapathV0V8V2AamemV1V3OamemV1V7IamemV1V5AamemV30V5NOamemV30V3Iashortest_pathV0V30ainfix +V2c1FAainfix &lt;=V32ainfix +V2c1AapathV0V31V32EIamemV31V5FAamemV33V5Iainfix &lt;=V34V2IapathV0V33V34FAashortest_pathV0V35ainfix +V2c1IamemV35V3FAasubsetV3V5Aashortest_pathV0V36V2IamemV36V7FAasubsetV7V5Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV37V4NFNIainfix =V6aTrueNIamemV38V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV40V5IamemV40asuccV39FIamemV39V3NIamemV39V4NIamemV39V5FAamemV41V3NFIamemV42V4NFAamemV1V3OamemV1V4IamemV1V5AamemV43V5NOamemV43V3Iashortest_pathV0V43ainfix +V2c1FAainfix &lt;=V45ainfix +V2c1AapathV0V44V45EIamemV44V5FAamemV46V5Iainfix &lt;=V47V2IapathV0V46V47FAashortest_pathV0V48ainfix +V2c1IamemV48V3FAasubsetV3V5Aashortest_pathV0V49V2IamemV49V4FAasubsetV4V5FF">
@@ -776,10 +776,10 @@
            </goal>
            <goal
             name="WP_parameter bfs.5.1.1.3"
-            locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+            locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
             loclnum="104" loccnumb="6" loccnume="9"
             expl="parameter bfs"
-            sum="02596d92203049e7c675fe9b9eb091b2"
+            sum="dfe63b5022bdb47a4af2cc05523c5d19"
             proved="true"
             expanded="false"
             shape="asubsetV13V10Iainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIamemV15V7NFqainfix =V11aTrueFIamemV17V10IamemV17asuccV16FIamemV16V9NIamemV16V7NIamemV16V10FAamemV18V10IamemV18asuccV8FAamemV1V9OamemV1V7IamemV1V10AamemV19V10NOamemV19V9Iashortest_pathV0V19ainfix +V2c1FAainfix &lt;=V21ainfix +V2c1AapathV0V20V21EIamemV20V10FAamemV22V10Iainfix &lt;=V23V2IapathV0V22V23FAashortest_pathV0V24ainfix +V2c1IamemV24V9FAasubsetV9V10Aashortest_pathV0V25V2IamemV25V7FAasubsetV7V10FIamemV27V5IamemV27asuccV26FIamemV26V3NIamemV26V7NIamemV26V5Iainfix =V26V8NFAapathV0V8V28NIainfix &lt;V28V2FAapathV0V8V2AamemV1V3OamemV1V7IamemV1V5AamemV29V5NOamemV29V3Iashortest_pathV0V29ainfix +V2c1FAainfix &lt;=V31ainfix +V2c1AapathV0V30V31EIamemV30V5FAamemV32V5Iainfix &lt;=V33V2IapathV0V32V33FAashortest_pathV0V34ainfix +V2c1IamemV34V3FAasubsetV3V5Aashortest_pathV0V35V2IamemV35V7FAasubsetV7V5Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV36V4NFNIainfix =V6aTrueNIamemV37V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV39V5IamemV39asuccV38FIamemV38V3NIamemV38V4NIamemV38V5FAamemV40V3NFIamemV41V4NFAamemV1V3OamemV1V4IamemV1V5AamemV42V5NOamemV42V3Iashortest_pathV0V42ainfix +V2c1FAainfix &lt;=V44ainfix +V2c1AapathV0V43V44EIamemV43V5FAamemV45V5Iainfix &lt;=V46V2IapathV0V45V46FAashortest_pathV0V47ainfix +V2c1IamemV47V3FAasubsetV3V5Aashortest_pathV0V48V2IamemV48V4FAasubsetV4V5FF">
@@ -796,10 +796,10 @@
            </goal>
            <goal
             name="WP_parameter bfs.5.1.1.4"
-            locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+            locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
             loclnum="104" loccnumb="6" loccnume="9"
             expl="parameter bfs"
-            sum="d516807d2d58f066cef3926116f0b91a"
+            sum="4a1f1ac3064eb659f272ffe0378cb349"
             proved="true"
             expanded="false"
             shape="ashortest_pathV0V15ainfix +V14c1IamemV15V13FIainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIamemV16V7NFqainfix =V11aTrueFIamemV18V10IamemV18asuccV17FIamemV17V9NIamemV17V7NIamemV17V10FAamemV19V10IamemV19asuccV8FAamemV1V9OamemV1V7IamemV1V10AamemV20V10NOamemV20V9Iashortest_pathV0V20ainfix +V2c1FAainfix &lt;=V22ainfix +V2c1AapathV0V21V22EIamemV21V10FAamemV23V10Iainfix &lt;=V24V2IapathV0V23V24FAashortest_pathV0V25ainfix +V2c1IamemV25V9FAasubsetV9V10Aashortest_pathV0V26V2IamemV26V7FAasubsetV7V10FIamemV28V5IamemV28asuccV27FIamemV27V3NIamemV27V7NIamemV27V5Iainfix =V27V8NFAapathV0V8V29NIainfix &lt;V29V2FAapathV0V8V2AamemV1V3OamemV1V7IamemV1V5AamemV30V5NOamemV30V3Iashortest_pathV0V30ainfix +V2c1FAainfix &lt;=V32ainfix +V2c1AapathV0V31V32EIamemV31V5FAamemV33V5Iainfix &lt;=V34V2IapathV0V33V34FAashortest_pathV0V35ainfix +V2c1IamemV35V3FAasubsetV3V5Aashortest_pathV0V36V2IamemV36V7FAasubsetV7V5Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV37V4NFNIainfix =V6aTrueNIamemV38V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV40V5IamemV40asuccV39FIamemV39V3NIamemV39V4NIamemV39V5FAamemV41V3NFIamemV42V4NFAamemV1V3OamemV1V4IamemV1V5AamemV43V5NOamemV43V3Iashortest_pathV0V43ainfix +V2c1FAainfix &lt;=V45ainfix +V2c1AapathV0V44V45EIamemV44V5FAamemV46V5Iainfix &lt;=V47V2IapathV0V46V47FAashortest_pathV0V48ainfix +V2c1IamemV48V3FAasubsetV3V5Aashortest_pathV0V49V2IamemV49V4FAasubsetV4V5FF">
@@ -816,10 +816,10 @@
            </goal>
            <goal
             name="WP_parameter bfs.5.1.1.5"
-            locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+            locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
             loclnum="104" loccnumb="6" loccnume="9"
             expl="parameter bfs"
-            sum="79872893781a55c7902d00b3cbaf9975"
+            sum="6cce137c7ddefcf767fa3ebc22682c94"
             proved="true"
             expanded="false"
             shape="amemV15V10Iainfix &lt;=V16V14IapathV0V15V16FIainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIamemV17V7NFqainfix =V11aTrueFIamemV19V10IamemV19asuccV18FIamemV18V9NIamemV18V7NIamemV18V10FAamemV20V10IamemV20asuccV8FAamemV1V9OamemV1V7IamemV1V10AamemV21V10NOamemV21V9Iashortest_pathV0V21ainfix +V2c1FAainfix &lt;=V23ainfix +V2c1AapathV0V22V23EIamemV22V10FAamemV24V10Iainfix &lt;=V25V2IapathV0V24V25FAashortest_pathV0V26ainfix +V2c1IamemV26V9FAasubsetV9V10Aashortest_pathV0V27V2IamemV27V7FAasubsetV7V10FIamemV29V5IamemV29asuccV28FIamemV28V3NIamemV28V7NIamemV28V5Iainfix =V28V8NFAapathV0V8V30NIainfix &lt;V30V2FAapathV0V8V2AamemV1V3OamemV1V7IamemV1V5AamemV31V5NOamemV31V3Iashortest_pathV0V31ainfix +V2c1FAainfix &lt;=V33ainfix +V2c1AapathV0V32V33EIamemV32V5FAamemV34V5Iainfix &lt;=V35V2IapathV0V34V35FAashortest_pathV0V36ainfix +V2c1IamemV36V3FAasubsetV3V5Aashortest_pathV0V37V2IamemV37V7FAasubsetV7V5Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV38V4NFNIainfix =V6aTrueNIamemV39V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV41V5IamemV41asuccV40FIamemV40V3NIamemV40V4NIamemV40V5FAamemV42V3NFIamemV43V4NFAamemV1V3OamemV1V4IamemV1V5AamemV44V5NOamemV44V3Iashortest_pathV0V44ainfix +V2c1FAainfix &lt;=V46ainfix +V2c1AapathV0V45V46EIamemV45V5FAamemV47V5Iainfix &lt;=V48V2IapathV0V47V48FAashortest_pathV0V49ainfix +V2c1IamemV49V3FAasubsetV3V5Aashortest_pathV0V50V2IamemV50V4FAasubsetV4V5FF">
@@ -836,10 +836,10 @@
            </goal>
            <goal
             name="WP_parameter bfs.5.1.1.6"
-            locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+            locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
             loclnum="104" loccnumb="6" loccnume="9"
             expl="parameter bfs"
-            sum="12ebca8701e8acc54d05da3b5758e2cd"
+            sum="c66d34974afd894afff9d79762110ce7"
             proved="true"
             expanded="false"
             shape="ainfix &lt;=V16ainfix +V14c1AapathV0V15V16EIamemV15V10FIainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIamemV17V7NFqainfix =V11aTrueFIamemV19V10IamemV19asuccV18FIamemV18V9NIamemV18V7NIamemV18V10FAamemV20V10IamemV20asuccV8FAamemV1V9OamemV1V7IamemV1V10AamemV21V10NOamemV21V9Iashortest_pathV0V21ainfix +V2c1FAainfix &lt;=V23ainfix +V2c1AapathV0V22V23EIamemV22V10FAamemV24V10Iainfix &lt;=V25V2IapathV0V24V25FAashortest_pathV0V26ainfix +V2c1IamemV26V9FAasubsetV9V10Aashortest_pathV0V27V2IamemV27V7FAasubsetV7V10FIamemV29V5IamemV29asuccV28FIamemV28V3NIamemV28V7NIamemV28V5Iainfix =V28V8NFAapathV0V8V30NIainfix &lt;V30V2FAapathV0V8V2AamemV1V3OamemV1V7IamemV1V5AamemV31V5NOamemV31V3Iashortest_pathV0V31ainfix +V2c1FAainfix &lt;=V33ainfix +V2c1AapathV0V32V33EIamemV32V5FAamemV34V5Iainfix &lt;=V35V2IapathV0V34V35FAashortest_pathV0V36ainfix +V2c1IamemV36V3FAasubsetV3V5Aashortest_pathV0V37V2IamemV37V7FAasubsetV7V5Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV38V4NFNIainfix =V6aTrueNIamemV39V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV41V5IamemV41asuccV40FIamemV40V3NIamemV40V4NIamemV40V5FAamemV42V3NFIamemV43V4NFAamemV1V3OamemV1V4IamemV1V5AamemV44V5NOamemV44V3Iashortest_pathV0V44ainfix +V2c1FAainfix &lt;=V46ainfix +V2c1AapathV0V45V46EIamemV45V5FAamemV47V5Iainfix &lt;=V48V2IapathV0V47V48FAashortest_pathV0V49ainfix +V2c1IamemV49V3FAasubsetV3V5Aashortest_pathV0V50V2IamemV50V4FAasubsetV4V5FF">
@@ -851,15 +851,15 @@
              memlimit="0"
              obsolete="false"
              archived="false">
-             <result status="valid" time="2.39"/>
+             <result status="valid" time="1.20"/>
             </proof>
            </goal>
            <goal
             name="WP_parameter bfs.5.1.1.7"
-            locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+            locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
             loclnum="104" loccnumb="6" loccnume="9"
             expl="parameter bfs"
-            sum="c72db32d71bfab12f696a8f0b86978a8"
+            sum="858916a8e2aeee0a63e8f7b25c8de074"
             proved="true"
             expanded="false"
             shape="amemV15V10NOamemV15V13Iashortest_pathV0V15ainfix +V14c1FIainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIamemV16V7NFqainfix =V11aTrueFIamemV18V10IamemV18asuccV17FIamemV17V9NIamemV17V7NIamemV17V10FAamemV19V10IamemV19asuccV8FAamemV1V9OamemV1V7IamemV1V10AamemV20V10NOamemV20V9Iashortest_pathV0V20ainfix +V2c1FAainfix &lt;=V22ainfix +V2c1AapathV0V21V22EIamemV21V10FAamemV23V10Iainfix &lt;=V24V2IapathV0V23V24FAashortest_pathV0V25ainfix +V2c1IamemV25V9FAasubsetV9V10Aashortest_pathV0V26V2IamemV26V7FAasubsetV7V10FIamemV28V5IamemV28asuccV27FIamemV27V3NIamemV27V7NIamemV27V5Iainfix =V27V8NFAapathV0V8V29NIainfix &lt;V29V2FAapathV0V8V2AamemV1V3OamemV1V7IamemV1V5AamemV30V5NOamemV30V3Iashortest_pathV0V30ainfix +V2c1FAainfix &lt;=V32ainfix +V2c1AapathV0V31V32EIamemV31V5FAamemV33V5Iainfix &lt;=V34V2IapathV0V33V34FAashortest_pathV0V35ainfix +V2c1IamemV35V3FAasubsetV3V5Aashortest_pathV0V36V2IamemV36V7FAasubsetV7V5Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV37V4NFNIainfix =V6aTrueNIamemV38V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV40V5IamemV40asuccV39FIamemV39V3NIamemV39V4NIamemV39V5FAamemV41V3NFIamemV42V4NFAamemV1V3OamemV1V4IamemV1V5AamemV43V5NOamemV43V3Iashortest_pathV0V43ainfix +V2c1FAainfix &lt;=V45ainfix +V2c1AapathV0V44V45EIamemV44V5FAamemV46V5Iainfix &lt;=V47V2IapathV0V46V47FAashortest_pathV0V48ainfix +V2c1IamemV48V3FAasubsetV3V5Aashortest_pathV0V49V2IamemV49V4FAasubsetV4V5FF">
@@ -876,10 +876,10 @@
            </goal>
            <goal
             name="WP_parameter bfs.5.1.1.8"
-            locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+            locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
             loclnum="104" loccnumb="6" loccnume="9"
             expl="parameter bfs"
-            sum="ee537851324723667d3a3c955ec0517c"
+            sum="3983222dcf6f6503ca16fa3fae0a3e44"
             proved="true"
             expanded="false"
             shape="amemV1V13OamemV1V12IamemV1V10Iainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIamemV15V7NFqainfix =V11aTrueFIamemV17V10IamemV17asuccV16FIamemV16V9NIamemV16V7NIamemV16V10FAamemV18V10IamemV18asuccV8FAamemV1V9OamemV1V7IamemV1V10AamemV19V10NOamemV19V9Iashortest_pathV0V19ainfix +V2c1FAainfix &lt;=V21ainfix +V2c1AapathV0V20V21EIamemV20V10FAamemV22V10Iainfix &lt;=V23V2IapathV0V22V23FAashortest_pathV0V24ainfix +V2c1IamemV24V9FAasubsetV9V10Aashortest_pathV0V25V2IamemV25V7FAasubsetV7V10FIamemV27V5IamemV27asuccV26FIamemV26V3NIamemV26V7NIamemV26V5Iainfix =V26V8NFAapathV0V8V28NIainfix &lt;V28V2FAapathV0V8V2AamemV1V3OamemV1V7IamemV1V5AamemV29V5NOamemV29V3Iashortest_pathV0V29ainfix +V2c1FAainfix &lt;=V31ainfix +V2c1AapathV0V30V31EIamemV30V5FAamemV32V5Iainfix &lt;=V33V2IapathV0V32V33FAashortest_pathV0V34ainfix +V2c1IamemV34V3FAasubsetV3V5Aashortest_pathV0V35V2IamemV35V7FAasubsetV7V5Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIamemV36V4NFNIainfix =V6aTrueNIamemV37V4NFqainfix =V6aTrueFIainfix =c0V2Oainfix &lt;c0V2AamemV39V5IamemV39asuccV38FIamemV38V3NIamemV38V4NIamemV38V5FAamemV40V3NFIamemV41V4NFAamemV1V3OamemV1V4IamemV1V5AamemV42V5NOamemV42V3Iashortest_pathV0V42ainfix +V2c1FAainfix &lt;=V44ainfix +V2c1AapathV0V43V44EIamemV43V5FAamemV45V5Iainfix &lt;=V46V2IapathV0V45V46FAashortest_pathV0V47ainfix +V2c1IamemV47V3FAasubsetV3V5Aashortest_pathV0V48V2IamemV48V4FAasubsetV4V5FF">
@@ -900,10 +900,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.5.2"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="8184c481251162323e5037b6df45f435"
+        sum="ce5a71f98d89b2ce88d2b33b952f00c6"
         proved="true"
         expanded="false"
         shape="ais_emptyV13Iais_emptyV12Iainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V15FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V16Iainfix =V16V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V17FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -920,10 +920,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.5.3"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="adfc9035219db4d3193f0012e579213f"
+        sum="9e67f54db667c3a1c4d8910134217f58"
         proved="true"
         expanded="false"
         shape="aclosureV10V12V13V15FIainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V16FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V17Iainfix =V17V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V18FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -940,10 +940,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.5.4"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="84421e1bd9c749b948373e906c242901"
+        sum="b6bca2c84e4c3ba75f91845e09b73bef"
         proved="true"
         expanded="false"
         shape="ainfix &lt;=c0V14Iainfix =V14ainfix +V2c1FIainfix =V13aemptyFIainfix =V12V9FIainfix =V11aTrueIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V15FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V16Iainfix =V16V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V17FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -962,10 +962,10 @@
      </goal>
      <goal
       name="WP_parameter bfs.6"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="104" loccnumb="6" loccnume="9"
       expl="loop invariant preservation"
-      sum="ca044d2601ef3e5ff0ddcc59e579fa4f"
+      sum="c9ae1ca70637e2e5f26565572a845fda"
       proved="true"
       expanded="true"
       shape="ainfix &lt;=c0V2AaclosureV10V7V9V12FAais_emptyV9Iais_emptyV7AainvV0V1V10V7V9V2Iainfix =V11aTrueNIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V13FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V14Iainfix =V14V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V15FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -977,10 +977,10 @@
        expanded="true">
        <goal
         name="WP_parameter bfs.6.1"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="8c99963be40d685e695150947fb6ee3d"
+        sum="76abfa9c14a0cd7bfa6891e12828b71e"
         proved="true"
         expanded="false"
         shape="ainvV0V1V10V7V9V2Iainfix =V11aTrueNIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V12FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V13Iainfix =V13V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V14FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -997,10 +997,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.6.2"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="794b7aa4207e30b28a3ffbb4842d1533"
+        sum="59d378f55da0d341f030ec8e6fc9893a"
         proved="true"
         expanded="false"
         shape="ais_emptyV9Iais_emptyV7Iainfix =V11aTrueNIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V12FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V13Iainfix =V13V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V14FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -1017,10 +1017,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.6.3"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="82bdc55e958c2ae0fbce57f6438a1860"
+        sum="561b0584742a99091c24c176d221711a"
         proved="true"
         expanded="false"
         shape="aclosureV10V7V9V12FIainfix =V11aTrueNIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V13FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V14Iainfix =V14V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V15FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -1037,10 +1037,10 @@
        </goal>
        <goal
         name="WP_parameter bfs.6.4"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="parameter bfs"
-        sum="acc695fb325722b0de6daad8f6a0ebbf"
+        sum="3ac2387d6c5cf7a8ae22d58a7d22a2d2"
         proved="true"
         expanded="false"
         shape="ainfix &lt;=c0V2Iainfix =V11aTrueNIais_emptyV7qainfix =V11aTrueFIaclosureV10V7V9V12FAasubsetasuccV8V10AainvV0V1V10V7V9V2FIaclosureV5V7V3V13Iainfix =V13V8NFAashortest_pathV0V8V2AainvV0V1V5V7V3V2Iainfix =V8V1NIainfix =V7aremoveV8V4AamemV8V4FFIais_emptyV4NIainfix =V6aTrueNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V14FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -1059,10 +1059,10 @@
      </goal>
      <goal
       name="WP_parameter bfs.7"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="104" loccnumb="6" loccnume="9"
       expl="assertion"
-      sum="4c143433aac4d2c32716e8a3f3bf9eb3"
+      sum="d8f46a3a95e8b4654204017320361ee8"
       proved="true"
       expanded="true"
       shape="amemV1V5NIainfix =V6aTrueNNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V7FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -1074,10 +1074,10 @@
        expanded="true">
        <goal
         name="WP_parameter bfs.7.1"
-        locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+        locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
         loclnum="104" loccnumb="6" loccnume="9"
         expl="assertion"
-        sum="4c143433aac4d2c32716e8a3f3bf9eb3"
+        sum="d8f46a3a95e8b4654204017320361ee8"
         proved="true"
         expanded="false"
         shape="amemV1V5NIainfix =V6aTrueNNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V7FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
@@ -1104,10 +1104,10 @@
      </goal>
      <goal
       name="WP_parameter bfs.8"
-      locfile="programs/vstte12_bfs/../vstte12_bfs.mlw"
+      locfile="examples/programs/vstte12_bfs/../vstte12_bfs.mlw"
       loclnum="104" loccnumb="6" loccnume="9"
       expl="postcondition"
-      sum="95b204a12556c04f1f7ac6546934750b"
+      sum="d6b6d4f03fe87c03b1cf1a98d8ead156"
       proved="true"
       expanded="false"
       shape="apathV0V1V7NFIamemV1V5NIainfix =V6aTrueNNIais_emptyV4qainfix =V6aTrueFIainfix &lt;=c0V2AaclosureV5V4V3V8FAais_emptyV3Iais_emptyV4AainvV0V1V5V4V3V2FF">
diff --git a/examples/programs/vstte12_combinators/vstte12_combinators_WP_Combinators_WP_parameter_reduction_3.v b/examples/programs/vstte12_combinators/vstte12_combinators_WP_Combinators_WP_parameter_reduction_3.v
index 0833d88b1297b7983426fe47f3c7b89f772acfc0..b4eea4571ae54c5c8f7571b8c7a68f2de86b4ac7 100644
--- a/examples/programs/vstte12_combinators/vstte12_combinators_WP_Combinators_WP_parameter_reduction_3.v
+++ b/examples/programs/vstte12_combinators/vstte12_combinators_WP_Combinators_WP_parameter_reduction_3.v
@@ -1,34 +1,20 @@
 (* This file is generated by Why3's Coq driver *)
 (* Beware! Only edit allowed sections below    *)
-Require Import ZArith.
-Require Import Rbase.
+Require Import BuiltIn.
+Require BuiltIn.
 
 (* Why3 assumption *)
 Definition unit  := unit.
 
-Parameter qtmark : Type.
-
-Parameter at1: forall (a:Type), a -> qtmark -> a.
-Implicit Arguments at1.
-
-Parameter old: forall (a:Type), a -> a.
-Implicit Arguments old.
-
-(* Why3 assumption *)
-Definition implb(x:bool) (y:bool): bool := match (x,
-  y) with
-  | (true, false) => false
-  | (_, _) => true
-  end.
-
 (* Why3 assumption *)
 Inductive term  :=
   | S : term 
   | K : term 
   | App : term -> term -> term .
+Axiom term_WhyType : WhyType term.
+Existing Instance term_WhyType.
 
 (* Why3 assumption *)
-Set Implicit Arguments.
 Fixpoint is_value(t:term) {struct t}: Prop :=
   match t with
   | (K|S) => True
@@ -36,33 +22,30 @@ Fixpoint is_value(t:term) {struct t}: Prop :=
   | (App (App S v1) v2) => (is_value v1) /\ (is_value v2)
   | _ => False
   end.
-Unset Implicit Arguments.
 
 (* Why3 assumption *)
 Inductive context  :=
   | Hole : context 
   | Left : context -> term -> context 
   | Right : term -> context -> context .
+Axiom context_WhyType : WhyType context.
+Existing Instance context_WhyType.
 
 (* Why3 assumption *)
-Set Implicit Arguments.
 Fixpoint is_context(c:context) {struct c}: Prop :=
   match c with
   | Hole => True
   | (Left c1 _) => (is_context c1)
   | (Right v c1) => (is_value v) /\ (is_context c1)
   end.
-Unset Implicit Arguments.
 
 (* Why3 assumption *)
-Set Implicit Arguments.
 Fixpoint subst(c:context) (t:term) {struct c}: term :=
   match c with
   | Hole => t
   | (Left c1 t2) => (App (subst c1 t) t2)
   | (Right v1 c2) => (App v1 (subst c2 t))
   end.
-Unset Implicit Arguments.
 
 (* Why3 assumption *)
 Inductive infix_mnmngt : term -> term -> Prop :=
@@ -74,6 +57,12 @@ Inductive infix_mnmngt : term -> term -> Prop :=
       (infix_mnmngt (subst c (App (App (App S v1) v2) v3)) (subst c
       (App (App v1 v3) (App v2 v3)))))).
 
+Axiom red_left : forall (t1:term) (t2:term) (t:term), (infix_mnmngt t1 t2) ->
+  (infix_mnmngt (App t1 t) (App t2 t)).
+
+Axiom red_right : forall (v:term) (t1:term) (t2:term), (is_value v) ->
+  ((infix_mnmngt t1 t2) -> (infix_mnmngt (App v t1) (App v t2))).
+
 (* Why3 assumption *)
 Inductive relTR : term -> term -> Prop :=
   | BaseTransRefl : forall (x:term), (relTR x x)
@@ -99,8 +88,8 @@ Theorem WP_parameter_reduction : forall (t:term),
       match result with
       | K => True
       | S => True
-      | (App K v1) => forall (result1:term), ((relTR t2 result1) /\
-          (is_value result1)) -> (relTR t v1)
+      | (App K v1) => forall (us:term), ((relTR t2 us) /\ (is_value us)) ->
+          (relTR t v1)
       | (App S v1) => True
       | (App (App S v1) v2) => True
       | _ => True
@@ -112,7 +101,7 @@ destruct result; intuition.
 destruct result1; intuition.
 apply relTR_transitive with (App (App K result2) t2); auto.
 apply red_star_left; auto.
-apply relTR_transitive with (App (App K result2) result1); auto.
+apply relTR_transitive with (App (App K result2) us); auto.
 apply red_star_right; auto.
 assert (is_value result2).
 simpl in H1; auto.
diff --git a/examples/programs/vstte12_combinators/why3session.xml b/examples/programs/vstte12_combinators/why3session.xml
index 42c494b962cde9d1f80092810046e0c6c564b7cf..b39a7aa599340d0375403dd3d72e098634c5ec7d 100644
--- a/examples/programs/vstte12_combinators/why3session.xml
+++ b/examples/programs/vstte12_combinators/why3session.xml
@@ -106,7 +106,7 @@
     name="WP_parameter reduction"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
     loclnum="69" loccnumb="10" loccnume="19"
-    expl="normal postcondition"
+    expl="parameter reduction"
     sum="f47606e3e0c009f9257353a0d934e232"
     proved="true"
     expanded="true"
@@ -121,7 +121,7 @@
       name="WP_parameter reduction.1"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
       loclnum="69" loccnumb="10" loccnume="19"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="5822376ed62e0729f07c5c5102e964a4"
       proved="true"
       expanded="true"
@@ -141,7 +141,7 @@
       name="WP_parameter reduction.2"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
       loclnum="69" loccnumb="10" loccnume="19"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="afaabb13c13546fd5f308dafd1c0a527"
       proved="true"
       expanded="true"
@@ -161,7 +161,7 @@
       name="WP_parameter reduction.3"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
       loclnum="69" loccnumb="10" loccnume="19"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="17d0abace379d9e86487bc5af9ccae33"
       proved="true"
       expanded="true"
@@ -185,13 +185,21 @@
          name="expl:parameter reduction"/>
         <proof
          prover="2"
-         timelimit="10"
-         memlimit="0"
+         timelimit="5"
+         memlimit="1000"
          edited="vstte12_combinators_WP_Combinators_WP_parameter_reduction_1.v"
          obsolete="false"
          archived="false">
          <result status="valid" time="0.53"/>
         </proof>
+        <proof
+         prover="3"
+         timelimit="5"
+         memlimit="1000"
+         obsolete="false"
+         archived="false">
+         <result status="valid" time="4.65"/>
+        </proof>
        </goal>
        <goal
         name="WP_parameter reduction.3.2"
@@ -219,7 +227,7 @@
       name="WP_parameter reduction.4"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
       loclnum="69" loccnumb="10" loccnume="19"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="6eb81841b19ff322cb7f9dc4afa70eef"
       proved="true"
       expanded="true"
@@ -243,13 +251,21 @@
          name="expl:parameter reduction"/>
         <proof
          prover="2"
-         timelimit="10"
-         memlimit="0"
+         timelimit="5"
+         memlimit="1000"
          edited="vstte12_combinators_WP_Combinators_WP_parameter_reduction_2.v"
          obsolete="false"
          archived="false">
          <result status="valid" time="0.53"/>
         </proof>
+        <proof
+         prover="3"
+         timelimit="5"
+         memlimit="1000"
+         obsolete="false"
+         archived="false">
+         <result status="valid" time="2.67"/>
+        </proof>
        </goal>
        <goal
         name="WP_parameter reduction.4.2"
@@ -277,7 +293,7 @@
       name="WP_parameter reduction.5"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
       loclnum="69" loccnumb="10" loccnume="19"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="c51d0436ade8b4fe9ce575fb8ee41dba"
       proved="true"
       expanded="true"
@@ -301,12 +317,20 @@
          name="expl:parameter reduction"/>
         <proof
          prover="2"
-         timelimit="10"
-         memlimit="0"
+         timelimit="5"
+         memlimit="1000"
          edited="vstte12_combinators_WP_Combinators_WP_parameter_reduction_3.v"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.54"/>
+         <result status="valid" time="0.58"/>
+        </proof>
+        <proof
+         prover="3"
+         timelimit="5"
+         memlimit="1000"
+         obsolete="false"
+         archived="false">
+         <result status="valid" time="0.58"/>
         </proof>
        </goal>
        <goal
@@ -335,7 +359,7 @@
       name="WP_parameter reduction.6"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
       loclnum="69" loccnumb="10" loccnume="19"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="967d86a472f15fdbaa40dafa705d1f7b"
       proved="true"
       expanded="true"
@@ -359,13 +383,21 @@
          name="expl:parameter reduction"/>
         <proof
          prover="2"
-         timelimit="10"
-         memlimit="0"
+         timelimit="5"
+         memlimit="1000"
          edited="vstte12_combinators_WP_Combinators_WP_parameter_reduction_4.v"
          obsolete="false"
          archived="false">
          <result status="valid" time="0.52"/>
         </proof>
+        <proof
+         prover="3"
+         timelimit="5"
+         memlimit="1000"
+         obsolete="false"
+         archived="false">
+         <result status="valid" time="2.72"/>
+        </proof>
        </goal>
        <goal
         name="WP_parameter reduction.6.2"
@@ -393,7 +425,7 @@
       name="WP_parameter reduction.7"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
       loclnum="69" loccnumb="10" loccnume="19"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="4266db95d18f2d2598e8be7396a65df3"
       proved="true"
       expanded="true"
@@ -417,8 +449,8 @@
          name="expl:parameter reduction"/>
         <proof
          prover="2"
-         timelimit="10"
-         memlimit="0"
+         timelimit="5"
+         memlimit="1000"
          edited="vstte12_combinators_WP_Combinators_WP_parameter_reduction_5.v"
          obsolete="false"
          archived="false">
@@ -472,7 +504,7 @@
    <goal
     name="reducible_or_value"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="88" loccnumb="8" loccnume="26"
+    loclnum="87" loccnumb="8" loccnume="26"
     sum="24fcd3beaec9d43461b04721602858dc"
     proved="true"
     expanded="true"
@@ -490,7 +522,7 @@
    <goal
     name="irreducible_is_value"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="93" loccnumb="8" loccnume="28"
+    loclnum="92" loccnumb="8" loccnume="28"
     sum="26ac7a4ce06b844318c3bce00b4fa381"
     proved="true"
     expanded="true"
@@ -508,7 +540,7 @@
    <goal
     name="only_K_reduces"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="106" loccnumb="8" loccnume="22"
+    loclnum="105" loccnumb="8" loccnume="22"
     sum="3a66ea764b9ed83da0587531b4bc3c2b"
     proved="true"
     expanded="true"
@@ -526,7 +558,7 @@
    <goal
     name="size_nonneg"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="115" loccnumb="8" loccnume="19"
+    loclnum="114" loccnumb="8" loccnume="19"
     sum="60dbce2880c2db9a3a3aad46fbb760be"
     proved="true"
     expanded="true"
@@ -544,12 +576,12 @@
    <goal
     name="WP_parameter reduction2"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="117" loccnumb="10" loccnume="20"
-    expl="normal postcondition"
-    sum="2986dd52d2d47e28d14664c0455a762d"
+    loclnum="116" loccnumb="10" loccnume="20"
+    expl="parameter reduction2"
+    sum="241384f07d411d93d109c95cf043fe40"
     proved="true"
     expanded="true"
-    shape="CV0aSais_valueaSAaonly_KaSaKais_valueaKAaonly_KaKaAppVVCV3aKais_valueaAppaKV4Aaonly_KaAppaKV4Iais_valueV4Aaonly_KV4FAaonly_KV2Aainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0aSais_valueaAppaSV5Aaonly_KaAppaSV5Iais_valueV5Aaonly_KV5FAaonly_KV2Aainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0aAppaKVais_valueV6Aaonly_KV6Iais_valueV7Aaonly_KV7FAaonly_KV2Aainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0aAppaSVais_valueaAppaAppaSV8V9Aaonly_KaAppaAppaSV8V9Iais_valueV9Aaonly_KV9FAaonly_KV2Aainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0aAppaAppaSVVais_valueV13Aaonly_KV13Iais_valueV13Aaonly_KV13FAaonly_KaAppaAppV10V12aAppV11V12Aainfix &lt;asizeaAppaAppV10V12aAppV11V12asizeV0Aainfix &lt;=c0asizeV0Iais_valueV12Aaonly_KV12FAaonly_KV2Aainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0wfIais_valueV3Aaonly_KV3FAaonly_KV1Aainfix &lt;asizeV1asizeV0Aainfix &lt;=c0asizeV0Iaonly_KV0F">
+    shape="CV0aSais_valueaSAaonly_KaSaKais_valueaKAaonly_KaKaAppVVCV3aKais_valueaAppaKV4Aaonly_KaAppaKV4Iais_valueV4Aaonly_KV4FAaonly_KV2ACV0aSfaKfaAppVVainfix =V6V2Oainfix =V5V2aSais_valueaAppaSV7Aaonly_KaAppaSV7Iais_valueV7Aaonly_KV7FAaonly_KV2ACV0aSfaKfaAppVVainfix =V9V2Oainfix =V8V2aAppaKVais_valueV10Aaonly_KV10Iais_valueV11Aaonly_KV11FAaonly_KV2ACV0aSfaKfaAppVVainfix =V13V2Oainfix =V12V2aAppaSVais_valueaAppaAppaSV14V15Aaonly_KaAppaAppaSV14V15Iais_valueV15Aaonly_KV15FAaonly_KV2ACV0aSfaKfaAppVVainfix =V17V2Oainfix =V16V2aAppaAppaSVVais_valueV21Aaonly_KV21Iais_valueV21Aaonly_KV21FAaonly_KaAppaAppV18V20aAppV19V20ACV0aSfaKfaAppVVainfix =V23aAppaAppV18V20aAppV19V20Oainfix =V22aAppaAppV18V20aAppV19V20Iais_valueV20Aaonly_KV20FAaonly_KV2ACV0aSfaKfaAppVVainfix =V25V2Oainfix =V24V2wfIais_valueV3Aaonly_KV3FAaonly_KV1ACV0aSfaKfaAppVVainfix =V27V1Oainfix =V26V1Iaonly_KV0F">
     <label
      name="expl:parameter reduction2"/>
     <transf
@@ -559,8 +591,8 @@
      <goal
       name="WP_parameter reduction2.1"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="65158c09e391076bd4559192a78ffa93"
       proved="true"
       expanded="true"
@@ -579,8 +611,8 @@
      <goal
       name="WP_parameter reduction2.2"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="ca38781af69968497b501ea1473d21af"
       proved="true"
       expanded="true"
@@ -599,12 +631,12 @@
      <goal
       name="WP_parameter reduction2.3"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="variant decreases"
-      sum="1d01069200f215aecb3b0d8e5d980297"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="variant decrease"
+      sum="61720b2550833443f7bf0feb2e545209"
       proved="true"
       expanded="true"
-      shape="CV0aStaKtaAppVVainfix &lt;asizeV1asizeV0Aainfix &lt;=c0asizeV0Iaonly_KV0F">
+      shape="CV0aStaKtaAppVVCV0aSfaKfaAppVVainfix =V4V1Oainfix =V3V1Iaonly_KV0F">
       <label
        name="expl:parameter reduction2"/>
       <proof
@@ -619,7 +651,7 @@
      <goal
       name="WP_parameter reduction2.4"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
+      loclnum="116" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="311b49be1e3ff7ab24540c0ed1e44b6e"
       proved="true"
@@ -639,12 +671,12 @@
      <goal
       name="WP_parameter reduction2.5"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="variant decreases"
-      sum="aa08f726ed3f0454da1633aa99832030"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="variant decrease"
+      sum="ab8b646fa411269897fbf15af9b0b68f"
       proved="true"
       expanded="true"
-      shape="CV0aStaKtaAppVVCV3aKainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0aStaAppaKVtaAppaSVtaAppaAppaSVVtwtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
+      shape="CV0aStaKtaAppVVCV3aKCV0aSfaKfaAppVVainfix =V5V2Oainfix =V4V2aStaAppaKVtaAppaSVtaAppaAppaSVVtwtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
       <label
        name="expl:parameter reduction2"/>
       <proof
@@ -659,7 +691,7 @@
      <goal
       name="WP_parameter reduction2.6"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
+      loclnum="116" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="233eaba1a451cbf14a93fa690806c28e"
       proved="true"
@@ -679,8 +711,8 @@
      <goal
       name="WP_parameter reduction2.7"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="147dd1aeb3dc0343b261b2b22d6dc479"
       proved="true"
       expanded="true"
@@ -699,12 +731,12 @@
      <goal
       name="WP_parameter reduction2.8"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="variant decreases"
-      sum="497106786bb4c0c2c30b458bf91e7ef4"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="variant decrease"
+      sum="88fa0a9737b9abbb622b400bcf463577"
       proved="true"
       expanded="true"
-      shape="CV0aStaKtaAppVVCV3aKtaSainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0aAppaKVtaAppaSVtaAppaAppaSVVtwtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
+      shape="CV0aStaKtaAppVVCV3aKtaSCV0aSfaKfaAppVVainfix =V5V2Oainfix =V4V2aAppaKVtaAppaSVtaAppaAppaSVVtwtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
       <label
        name="expl:parameter reduction2"/>
       <proof
@@ -719,7 +751,7 @@
      <goal
       name="WP_parameter reduction2.9"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
+      loclnum="116" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="4692327337d2fa2523aecb28231bda22"
       proved="true"
@@ -739,8 +771,8 @@
      <goal
       name="WP_parameter reduction2.10"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="4a8f6720b315714b445a24a51b81d60a"
       proved="true"
       expanded="true"
@@ -759,12 +791,12 @@
      <goal
       name="WP_parameter reduction2.11"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="variant decreases"
-      sum="9ac4c3b96d5c03e5c8bddbfb18a4309b"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="variant decrease"
+      sum="19a28d77abf5aee3e829c3f3006f820b"
       proved="true"
       expanded="true"
-      shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0aAppaSVtaAppaAppaSVVtwtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
+      shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVCV0aSfaKfaAppVVainfix =V6V2Oainfix =V5V2aAppaSVtaAppaAppaSVVtwtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
       <label
        name="expl:parameter reduction2"/>
       <proof
@@ -779,7 +811,7 @@
      <goal
       name="WP_parameter reduction2.12"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
+      loclnum="116" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="cea28a68d73520d307f3abda3e13a9f5"
       proved="true"
@@ -799,8 +831,8 @@
      <goal
       name="WP_parameter reduction2.13"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="50d83379dd7d03c8ef303103a328df5a"
       proved="true"
       expanded="true"
@@ -819,12 +851,12 @@
      <goal
       name="WP_parameter reduction2.14"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="variant decreases"
-      sum="949212de2d3f077eaf97c258d4b873ab"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="variant decrease"
+      sum="dca13e008279663168b55ddf3341fbd6"
       proved="true"
       expanded="true"
-      shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0aAppaAppaSVVtwtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
+      shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVCV0aSfaKfaAppVVainfix =V7V2Oainfix =V6V2aAppaAppaSVVtwtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
       <label
        name="expl:parameter reduction2"/>
       <proof
@@ -839,7 +871,7 @@
      <goal
       name="WP_parameter reduction2.15"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
+      loclnum="116" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="494a8a323622a02e43197af97410f3a0"
       proved="true"
@@ -859,8 +891,8 @@
      <goal
       name="WP_parameter reduction2.16"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="b84ec6379154d11027ea4d25dc81b35f"
       proved="true"
       expanded="true"
@@ -879,12 +911,12 @@
      <goal
       name="WP_parameter reduction2.17"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="variant decreases"
-      sum="bd904f223f53dcb6053285d3d276f33f"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="variant decrease"
+      sum="74470c99ad0cbe0f05c8dca7005f9b8d"
       proved="true"
       expanded="true"
-      shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVtaAppaAppaSVVainfix &lt;asizeV2asizeV0Aainfix &lt;=c0asizeV0wtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
+      shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVtaAppaAppaSVVCV0aSfaKfaAppVVainfix =V9V2Oainfix =V8V2wtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
       <label
        name="expl:parameter reduction2"/>
       <proof
@@ -899,7 +931,7 @@
      <goal
       name="WP_parameter reduction2.18"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
+      loclnum="116" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="01a524f43fd803ea7ec20158ab2771b5"
       proved="true"
@@ -919,12 +951,12 @@
      <goal
       name="WP_parameter reduction2.19"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="variant decreases"
-      sum="22dfe0b2c45acab1fccc0e8643ab679f"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="variant decrease"
+      sum="d9f17f71d1b8b06714e8d06fd70e148f"
       proved="true"
       expanded="true"
-      shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVtaAppaAppaSVVainfix &lt;asizeaAppaAppV6V8aAppV7V8asizeV0Aainfix &lt;=c0asizeV0Iais_valueV8Aaonly_KV8FIaonly_KV2wtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
+      shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVtaAppaAppaSVVCV0aSfaKfaAppVVainfix =V10aAppaAppV6V8aAppV7V8Oainfix =V9aAppaAppV6V8aAppV7V8Iais_valueV8Aaonly_KV8FIaonly_KV2wtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
       <label
        name="expl:parameter reduction2"/>
       <transf
@@ -934,17 +966,25 @@
        <goal
         name="WP_parameter reduction2.19.1"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="117" loccnumb="10" loccnume="20"
-        expl="parameter reduction2"
-        sum="d44ffe987d0a0d7783019d9058d3dad6"
+        loclnum="116" loccnumb="10" loccnume="20"
+        expl="variant decrease"
+        sum="2e3bab3293bcc0a5af6a7bbfb7eb3317"
         proved="true"
-        expanded="false"
-        shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVtaAppaAppaSVVainfix &lt;=c0asizeV0Iais_valueV8Aaonly_KV8FIaonly_KV2wtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
+        expanded="true"
+        shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVtaAppaAppaSVVCV0aSfaKtaAppVVtIais_valueV8Aaonly_KV8FIaonly_KV2wtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
         <label
          name="expl:parameter reduction2"/>
         <proof
-         prover="0"
-         timelimit="15"
+         prover="1"
+         timelimit="5"
+         memlimit="1000"
+         obsolete="false"
+         archived="false">
+         <result status="valid" time="0.02"/>
+        </proof>
+        <proof
+         prover="3"
+         timelimit="5"
          memlimit="1000"
          obsolete="false"
          archived="false">
@@ -954,12 +994,12 @@
        <goal
         name="WP_parameter reduction2.19.2"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="117" loccnumb="10" loccnume="20"
-        expl="parameter reduction2"
-        sum="ed4123091fbb8f9e5fb757b204605ccd"
+        loclnum="116" loccnumb="10" loccnume="20"
+        expl="variant decrease"
+        sum="88da6061ff4732613b47a70655fdbd24"
         proved="true"
         expanded="true"
-        shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVtaAppaAppaSVVainfix &lt;asizeaAppaAppV6V8aAppV7V8asizeV0Iais_valueV8Aaonly_KV8FIaonly_KV2wtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
+        shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVtaAppaAppaSVVCV0aStaKfaAppVVtIais_valueV8Aaonly_KV8FIaonly_KV2wtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
         <label
          name="expl:parameter reduction2"/>
         <proof
@@ -968,16 +1008,35 @@
          memlimit="1000"
          obsolete="false"
          archived="false">
-         <result status="valid" time="3.62"/>
+         <result status="valid" time="0.02"/>
         </proof>
         <proof
-         prover="2"
-         timelimit="10"
-         memlimit="0"
-         edited="vstte12_combinators_WP_Combinators_WP_parameter_reduction2_1.v"
+         prover="3"
+         timelimit="5"
+         memlimit="1000"
+         obsolete="false"
+         archived="false">
+         <result status="valid" time="0.05"/>
+        </proof>
+       </goal>
+       <goal
+        name="WP_parameter reduction2.19.3"
+        locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
+        loclnum="116" loccnumb="10" loccnume="20"
+        expl="variant decrease"
+        sum="15cf47ffc0f341a451c685d27f99a464"
+        proved="true"
+        expanded="true"
+        shape="CV0aStaKtaAppVVCV3aKtaStaAppaKVtaAppaSVtaAppaAppaSVVCV0aStaKtaAppVVainfix =V10aAppaAppV6V8aAppV7V8Oainfix =V9aAppaAppV6V8aAppV7V8Iais_valueV8Aaonly_KV8FIaonly_KV2wtIais_valueV3Aaonly_KV3FIaonly_KV1Iaonly_KV0F">
+        <label
+         name="expl:parameter reduction2"/>
+        <proof
+         prover="1"
+         timelimit="5"
+         memlimit="1000"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.47"/>
+         <result status="valid" time="4.06"/>
         </proof>
         <proof
          prover="3"
@@ -985,7 +1044,7 @@
          memlimit="1000"
          obsolete="false"
          archived="false">
-         <result status="valid" time="0.32"/>
+         <result status="valid" time="0.46"/>
         </proof>
        </goal>
       </transf>
@@ -993,7 +1052,7 @@
      <goal
       name="WP_parameter reduction2.20"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
+      loclnum="116" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="cdb001d50b80ab18b4a43d339ae602f5"
       proved="true"
@@ -1008,7 +1067,7 @@
        <goal
         name="WP_parameter reduction2.20.1"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="117" loccnumb="10" loccnume="20"
+        loclnum="116" loccnumb="10" loccnume="20"
         expl="precondition"
         sum="cdb001d50b80ab18b4a43d339ae602f5"
         proved="true"
@@ -1047,8 +1106,8 @@
      <goal
       name="WP_parameter reduction2.21"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="116" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="78d1480992e6cb135c4ad6dd33c2d35a"
       proved="true"
       expanded="true"
@@ -1067,7 +1126,7 @@
      <goal
       name="WP_parameter reduction2.22"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="117" loccnumb="10" loccnume="20"
+      loclnum="116" loccnumb="10" loccnume="20"
       expl="parameter reduction2"
       sum="273b0e4d338c534fa74006f018c73996"
       proved="true"
@@ -1089,7 +1148,7 @@
    <goal
     name="ks1"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="141" loccnumb="8" loccnume="11"
+    loclnum="140" loccnumb="8" loccnume="11"
     sum="1f39244ebb2a70a4c3634dd0bb79d29d"
     proved="true"
     expanded="true"
@@ -1106,7 +1165,7 @@
    <goal
     name="only_K_ks"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="143" loccnumb="8" loccnume="17"
+    loclnum="142" loccnumb="8" loccnume="17"
     sum="6de11823878fa2ef6e835e28b9e000a7"
     proved="true"
     expanded="true"
@@ -1124,7 +1183,7 @@
    <goal
     name="ks_inversion"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="145" loccnumb="8" loccnume="20"
+    loclnum="144" loccnumb="8" loccnume="20"
     sum="2a175b3234edf3b7a79abe539ef6a6b1"
     proved="true"
     expanded="true"
@@ -1141,7 +1200,7 @@
    <goal
     name="ks_injective"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="148" loccnumb="8" loccnume="20"
+    loclnum="147" loccnumb="8" loccnume="20"
     sum="ef7dcfe89f8be0606760818fce60f963"
     proved="true"
     expanded="true"
@@ -1159,8 +1218,8 @@
    <goal
     name="WP_parameter reduction3"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="153" loccnumb="10" loccnume="20"
-    expl="normal postcondition"
+    loclnum="152" loccnumb="10" loccnume="20"
+    expl="parameter reduction3"
     sum="e8a237ed7452391c620d4ac1cadf997e"
     proved="true"
     expanded="true"
@@ -1174,8 +1233,8 @@
      <goal
       name="WP_parameter reduction3.1"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="152" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="d8ff2b67ed9b2738a0bb7737f03d6cb6"
       proved="true"
       expanded="true"
@@ -1194,8 +1253,8 @@
      <goal
       name="WP_parameter reduction3.2"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="152" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="e888ea7d24d716e7afc2682f852c8883"
       proved="true"
       expanded="true"
@@ -1209,7 +1268,7 @@
        <goal
         name="WP_parameter reduction3.2.1"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="153" loccnumb="10" loccnume="20"
+        loclnum="152" loccnumb="10" loccnume="20"
         expl="parameter reduction3"
         sum="ab8d2080627eb71fdadda0e2a5c02d17"
         proved="true"
@@ -1245,7 +1304,7 @@
        <goal
         name="WP_parameter reduction3.2.2"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="153" loccnumb="10" loccnume="20"
+        loclnum="152" loccnumb="10" loccnume="20"
         expl="parameter reduction3"
         sum="4441c7454c563e50f2598a70fe7debb3"
         proved="true"
@@ -1267,7 +1326,7 @@
      <goal
       name="WP_parameter reduction3.3"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
+      loclnum="152" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="7de5f22aa859903d6d0875d477b98506"
       proved="true"
@@ -1287,7 +1346,7 @@
      <goal
       name="WP_parameter reduction3.4"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
+      loclnum="152" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="788708f88693043ff7ee194d100e79a3"
       proved="true"
@@ -1307,8 +1366,8 @@
      <goal
       name="WP_parameter reduction3.5"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="152" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="fd2376460d301f80ad80742b54279e51"
       proved="true"
       expanded="true"
@@ -1322,7 +1381,7 @@
        <goal
         name="WP_parameter reduction3.5.1"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="153" loccnumb="10" loccnume="20"
+        loclnum="152" loccnumb="10" loccnume="20"
         expl="parameter reduction3"
         sum="e015e8a831d39b89fea0879a73f77140"
         proved="true"
@@ -1342,7 +1401,7 @@
        <goal
         name="WP_parameter reduction3.5.2"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="153" loccnumb="10" loccnume="20"
+        loclnum="152" loccnumb="10" loccnume="20"
         expl="parameter reduction3"
         sum="92eac24634d49a90d5b0f63b9ec12763"
         proved="true"
@@ -1363,7 +1422,7 @@
        <goal
         name="WP_parameter reduction3.5.3"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="153" loccnumb="10" loccnume="20"
+        loclnum="152" loccnumb="10" loccnume="20"
         expl="parameter reduction3"
         sum="562784f278c4d5da20ea24efb24636fe"
         proved="true"
@@ -1386,7 +1445,7 @@
      <goal
       name="WP_parameter reduction3.6"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
+      loclnum="152" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="7bb49211cc864a4e516f5218a956f201"
       proved="true"
@@ -1406,8 +1465,8 @@
      <goal
       name="WP_parameter reduction3.7"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="152" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="d2cc3054e972fb0f19b126eaac497554"
       proved="true"
       expanded="true"
@@ -1427,7 +1486,7 @@
      <goal
       name="WP_parameter reduction3.8"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
+      loclnum="152" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="d9c7d5c03f48978365f42b979d270c7e"
       proved="true"
@@ -1447,8 +1506,8 @@
      <goal
       name="WP_parameter reduction3.9"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="152" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="3f2c74a9253709aaa95dceac4d9b56e1"
       proved="true"
       expanded="true"
@@ -1462,7 +1521,7 @@
        <goal
         name="WP_parameter reduction3.9.1"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="153" loccnumb="10" loccnume="20"
+        loclnum="152" loccnumb="10" loccnume="20"
         expl="parameter reduction3"
         sum="4d11da8079eef01166611bd80d10c963"
         proved="true"
@@ -1498,7 +1557,7 @@
        <goal
         name="WP_parameter reduction3.9.2"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="153" loccnumb="10" loccnume="20"
+        loclnum="152" loccnumb="10" loccnume="20"
         expl="parameter reduction3"
         sum="8199d09f4a419293462f313a64f15ed1"
         proved="true"
@@ -1519,7 +1578,7 @@
        <goal
         name="WP_parameter reduction3.9.3"
         locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-        loclnum="153" loccnumb="10" loccnume="20"
+        loclnum="152" loccnumb="10" loccnume="20"
         expl="parameter reduction3"
         sum="dd3b5b44382eea38e9e1516338a2e5c1"
         proved="true"
@@ -1541,7 +1600,7 @@
      <goal
       name="WP_parameter reduction3.10"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
+      loclnum="152" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="a05ffaa1a10c411a3ecfbee625378ec1"
       proved="true"
@@ -1561,8 +1620,8 @@
      <goal
       name="WP_parameter reduction3.11"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="152" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="233bc8418598643f0b4383cbe98b206e"
       proved="true"
       expanded="true"
@@ -1582,7 +1641,7 @@
      <goal
       name="WP_parameter reduction3.12"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
+      loclnum="152" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="d29de82c77f3a2a30267c9ecfe7cf1ef"
       proved="true"
@@ -1602,7 +1661,7 @@
      <goal
       name="WP_parameter reduction3.13"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
+      loclnum="152" loccnumb="10" loccnume="20"
       expl="precondition"
       sum="93503ac059a694a8f377a0ecd07498d8"
       proved="true"
@@ -1623,8 +1682,8 @@
      <goal
       name="WP_parameter reduction3.14"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
-      expl="normal postcondition"
+      loclnum="152" loccnumb="10" loccnume="20"
+      expl="postcondition"
       sum="e5f9e9aa417d4cf7c4ecf77ac02c4094"
       proved="true"
       expanded="true"
@@ -1644,7 +1703,7 @@
      <goal
       name="WP_parameter reduction3.15"
       locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-      loclnum="153" loccnumb="10" loccnume="20"
+      loclnum="152" loccnumb="10" loccnume="20"
       expl="parameter reduction3"
       sum="bdb821d8209b2f2980e76a537b10dd6c"
       proved="true"
@@ -1682,7 +1741,7 @@
    <goal
     name="ks_value"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="172" loccnumb="9" loccnume="17"
+    loclnum="171" loccnumb="9" loccnume="17"
     sum="b464611dd7bce9cf5bf6fa507376d8dc"
     proved="true"
     expanded="true"
@@ -1700,7 +1759,7 @@
    <goal
     name="ks_even_odd"
     locfile="examples/programs/vstte12_combinators/../vstte12_combinators.mlw"
-    loclnum="175" loccnumb="9" loccnume="20"
+    loclnum="174" loccnumb="9" loccnume="20"
     sum="375fabc7a0f9205f4b892b19c8298778"
     proved="true"
     expanded="true"
diff --git a/examples/programs/vstte12_tree_reconstruction/why3session.xml b/examples/programs/vstte12_tree_reconstruction/why3session.xml
index 649737a80fc4e074f736a4517ab68e56d6224c75..f43c86c788d894022f02ee2378376a613aeb87d8 100644
--- a/examples/programs/vstte12_tree_reconstruction/why3session.xml
+++ b/examples/programs/vstte12_tree_reconstruction/why3session.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE why3session SYSTEM "/home/andrei/prj/why-git/share/why3session.dtd">
 <why3session
- name="examples/programs/vstte12_tree_reconstruction/why3session.xml" shape_version="2">
+ name="programs/vstte12_tree_reconstruction/why3session.xml" shape_version="2">
  <prover
   id="0"
   name="Alt-Ergo"
@@ -28,13 +28,13 @@
   expanded="true">
   <theory
    name="Tree"
-   locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+   locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
    loclnum="12" loccnumb="7" loccnume="11"
    verified="true"
    expanded="true">
    <goal
     name="depths_head"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
     loclnum="28" loccnumb="8" loccnume="19"
     sum="012bdf507caa29677724bf8c9bb482bd"
     proved="true"
@@ -52,7 +52,7 @@
    </goal>
    <goal
     name="depths_unique"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
     loclnum="32" loccnumb="8" loccnume="21"
     sum="4b82f1d2e07f4ed519145f32f7822289"
     proved="true"
@@ -70,7 +70,7 @@
    </goal>
    <goal
     name="depths_prefix"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
     loclnum="36" loccnumb="8" loccnume="21"
     sum="7bd83781d45797aa02dc520213e229d1"
     proved="true"
@@ -88,7 +88,7 @@
    </goal>
    <goal
     name="depths_prefix_simple"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
     loclnum="40" loccnumb="8" loccnume="28"
     sum="0334d123aadf3c07b1abfd5811a15c89"
     proved="true"
@@ -105,7 +105,7 @@
    </goal>
    <goal
     name="depths_subtree"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
     loclnum="44" loccnumb="8" loccnume="22"
     sum="b1ea4a6e8d129bbb39a6789d0f1269c3"
     proved="true"
@@ -123,7 +123,7 @@
    </goal>
    <goal
     name="depths_unique2"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
     loclnum="48" loccnumb="8" loccnume="22"
     sum="d04c8975fb46bc5ad8b0ec414b36ce0a"
     proved="true"
@@ -142,15 +142,15 @@
   </theory>
   <theory
    name="TreeReconstruction"
-   locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+   locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
    loclnum="54" loccnumb="7" loccnume="25"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter build_rec"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
     loclnum="73" loccnumb="10" loccnume="19"
-    expl="exceptional postcondition"
+    expl="parameter build_rec"
     sum="8bcdf9bc6ac2988bf0626b7631d29053"
     proved="true"
     expanded="true"
@@ -163,7 +163,7 @@
      expanded="true">
      <goal
       name="WP_parameter build_rec.1"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
       loclnum="73" loccnumb="10" loccnume="19"
       expl="exceptional postcondition"
       sum="7d0633af89001333f50de612f0d95bae"
@@ -183,7 +183,7 @@
      </goal>
      <goal
       name="WP_parameter build_rec.2"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
       loclnum="73" loccnumb="10" loccnume="19"
       expl="exceptional postcondition"
       sum="0e412528e68e5ce46db98b9467b7c637"
@@ -203,9 +203,9 @@
      </goal>
      <goal
       name="WP_parameter build_rec.3"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
       loclnum="73" loccnumb="10" loccnume="19"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="cb073e0b451242ed096c29d7ea47adc3"
       proved="true"
       expanded="true"
@@ -223,9 +223,9 @@
      </goal>
      <goal
       name="WP_parameter build_rec.4"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
       loclnum="73" loccnumb="10" loccnume="19"
-      expl="variant decreases"
+      expl="variant decrease"
       sum="8cf857176a625c0b784af6c5008e4b57"
       proved="true"
       expanded="true"
@@ -238,9 +238,9 @@
        expanded="true">
        <goal
         name="WP_parameter build_rec.4.1"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
         loclnum="73" loccnumb="10" loccnume="19"
-        expl="variant decreases"
+        expl="variant decrease"
         sum="8cf857176a625c0b784af6c5008e4b57"
         proved="true"
         expanded="true"
@@ -260,9 +260,9 @@
      </goal>
      <goal
       name="WP_parameter build_rec.5"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
       loclnum="73" loccnumb="10" loccnume="19"
-      expl="variant decreases"
+      expl="variant decrease"
       sum="37831fc3e23c7ec16676b8a1358a5b7f"
       proved="true"
       expanded="true"
@@ -280,9 +280,9 @@
      </goal>
      <goal
       name="WP_parameter build_rec.6"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
       loclnum="73" loccnumb="10" loccnume="19"
-      expl="normal postcondition"
+      expl="postcondition"
       sum="b396d1bed5ff00b4018f833a73702dda"
       proved="true"
       expanded="true"
@@ -300,7 +300,7 @@
      </goal>
      <goal
       name="WP_parameter build_rec.7"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
       loclnum="73" loccnumb="10" loccnume="19"
       expl="exceptional postcondition"
       sum="13d4743e9948af872e77ae57c6dd80a1"
@@ -321,7 +321,7 @@
      </goal>
      <goal
       name="WP_parameter build_rec.8"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
       loclnum="73" loccnumb="10" loccnume="19"
       expl="exceptional postcondition"
       sum="9b5c67a7370ebef62cfcdd76844a8af9"
@@ -344,8 +344,8 @@
    </goal>
    <goal
     name="WP_parameter build"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="91" loccnumb="6" loccnume="11"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="90" loccnumb="6" loccnume="11"
     expl="parameter build"
     sum="5bc4cfbcc5ed37b08c2d01bdd3976fdf"
     proved="true"
@@ -359,9 +359,9 @@
      expanded="true">
      <goal
       name="WP_parameter build.1"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="91" loccnumb="6" loccnume="11"
-      expl="normal postcondition"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="90" loccnumb="6" loccnume="11"
+      expl="postcondition"
       sum="0850436823e091667da1e9d3e025bd85"
       proved="true"
       expanded="true"
@@ -379,8 +379,8 @@
      </goal>
      <goal
       name="WP_parameter build.2"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="91" loccnumb="6" loccnume="11"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="90" loccnumb="6" loccnume="11"
       expl="exceptional postcondition"
       sum="988d32b61ce5d5cb8b577948a9cb4f42"
       proved="true"
@@ -400,8 +400,8 @@
      </goal>
      <goal
       name="WP_parameter build.3"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="91" loccnumb="6" loccnume="11"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="90" loccnumb="6" loccnume="11"
       expl="exceptional postcondition"
       sum="e8e5224306bc367e9cb000fd8ee53e5c"
       proved="true"
@@ -424,14 +424,14 @@
   </theory>
   <theory
    name="Harness"
-   locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-   loclnum="103" loccnumb="7" loccnume="14"
+   locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+   loclnum="101" loccnumb="7" loccnume="14"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter harness"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="107" loccnumb="6" loccnume="13"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="105" loccnumb="6" loccnume="13"
     expl="parameter harness"
     sum="0e5caba30090196cb532455888de5989"
     proved="true"
@@ -445,9 +445,9 @@
      expanded="true">
      <goal
       name="WP_parameter harness.1"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="107" loccnumb="6" loccnume="13"
-      expl="normal postcondition"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="105" loccnumb="6" loccnume="13"
+      expl="postcondition"
       sum="5b6a26f8c10ca721a9889b422090d49c"
       proved="true"
       expanded="true"
@@ -466,8 +466,8 @@
      </goal>
      <goal
       name="WP_parameter harness.2"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="107" loccnumb="6" loccnume="13"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="105" loccnumb="6" loccnume="13"
       expl="parameter harness"
       sum="57832a30bc381d83fda940ceac135524"
       proved="true"
@@ -489,8 +489,8 @@
    </goal>
    <goal
     name="WP_parameter harness2"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="112" loccnumb="6" loccnume="14"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="110" loccnumb="6" loccnume="14"
     expl="parameter harness2"
     sum="f69566c2e975eeb790df09c28f71ed7b"
     proved="true"
@@ -511,19 +511,19 @@
   </theory>
   <theory
    name="ZipperBasedTermination"
-   locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-   loclnum="139" loccnumb="7" loccnume="29"
+   locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+   loclnum="136" loccnumb="7" loccnume="29"
    verified="true"
    expanded="true">
    <goal
     name="WP_parameter tc"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="148" loccnumb="10" loccnume="12"
-    expl="exceptional postcondition"
-    sum="cea8ca844a0372ecbddaaf72dfa50268"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="144" loccnumb="10" loccnume="12"
+    expl="parameter tc"
+    sum="5c954706fb89c98f7af9feab437f64b7"
     proved="true"
     expanded="true"
-    shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VViainfix =V8V4alexaTuple2ainfix +alengthV7alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3aTuple2ainfix +alengthV0alengthV1alengthV1alexaTuple2ainfix +alengthaConsaTuple2V4V5V0alengthV3alengthV3aTuple2ainfix +alengthV0alengthV1alengthV1aNiltwCV2aTuple2VVCV0aConsVVCV12aTuple2VViainfix =V14V10alexaTuple2ainfix +alengthV13alengthaConsaTuple2ainfix -V14c1aNodeV15V11V3alengthaConsaTuple2ainfix -V14c1aNodeV15V11V3aTuple2ainfix +alengthV0alengthV1alengthV1alexaTuple2ainfix +alengthaConsaTuple2V10V11V0alengthV3alengthV3aTuple2ainfix +alengthV0alengthV1alengthV1aNilalexaTuple2ainfix +alengthaConsaTuple2V10V11aNilalengthV3alengthV3aTuple2ainfix +alengthV0alengthV1alengthV1aNiltF">
+    shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VViainfix =V8V4ainfix &lt;alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthV7alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3Oainfix &lt;ainfix +alengthV7alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1ainfix &lt;alengthV3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthaConsaTuple2V4V5V0alengthV3Oainfix &lt;ainfix +alengthaConsaTuple2V4V5V0alengthV3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1aNiltwCV2aTuple2VVCV0aConsVVCV12aTuple2VViainfix =V14V10ainfix &lt;alengthaConsaTuple2ainfix -V14c1aNodeV15V11V3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthV13alengthaConsaTuple2ainfix -V14c1aNodeV15V11V3Oainfix &lt;ainfix +alengthV13alengthaConsaTuple2ainfix -V14c1aNodeV15V11V3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1ainfix &lt;alengthV3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthaConsaTuple2V10V11V0alengthV3Oainfix &lt;ainfix +alengthaConsaTuple2V10V11V0alengthV3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1aNilainfix &lt;alengthV3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthaConsaTuple2V10V11aNilalengthV3Oainfix &lt;ainfix +alengthaConsaTuple2V10V11aNilalengthV3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1aNiltF">
     <label
      name="expl:parameter tc"/>
     <transf
@@ -532,13 +532,13 @@
      expanded="true">
      <goal
       name="WP_parameter tc.1"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="148" loccnumb="10" loccnume="12"
-      expl="variant decreases"
-      sum="8fb32743d859ee6f282225d3f73c04ea"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="144" loccnumb="10" loccnume="12"
+      expl="variant decrease"
+      sum="c4e0475296093d1b4e28896259e93ff7"
       proved="true"
       expanded="true"
-      shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VValexaTuple2ainfix +alengthV7alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3aTuple2ainfix +alengthV0alengthV1alengthV1Iainfix =V8V4aNiltwtaNiltF">
+      shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix &lt;alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthV7alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3Oainfix &lt;ainfix +alengthV7alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1Iainfix =V8V4aNiltwtaNiltF">
       <label
        name="expl:parameter tc"/>
       <proof
@@ -552,13 +552,13 @@
      </goal>
      <goal
       name="WP_parameter tc.2"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="148" loccnumb="10" loccnume="12"
-      expl="variant decreases"
-      sum="a9d359c365b8ad64f59d036c6aafc1c9"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="144" loccnumb="10" loccnume="12"
+      expl="variant decrease"
+      sum="9b0d59887a0778cfb59980b1b63ba205"
       proved="true"
       expanded="true"
-      shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VValexaTuple2ainfix +alengthaConsaTuple2V4V5V0alengthV3alengthV3aTuple2ainfix +alengthV0alengthV1alengthV1Iainfix =V8V4NaNiltwtaNiltF">
+      shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix &lt;alengthV3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthaConsaTuple2V4V5V0alengthV3Oainfix &lt;ainfix +alengthaConsaTuple2V4V5V0alengthV3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1Iainfix =V8V4NaNiltwtaNiltF">
       <label
        name="expl:parameter tc"/>
       <proof
@@ -572,33 +572,13 @@
      </goal>
      <goal
       name="WP_parameter tc.3"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="148" loccnumb="10" loccnume="12"
-      expl="exceptional postcondition"
-      sum="d3e73d33ab7236533c3b91b858f0f01a"
-      proved="true"
-      expanded="true"
-      shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVtaNiltwtaNiltF">
-      <label
-       name="expl:parameter tc"/>
-      <proof
-       prover="0"
-       timelimit="20"
-       memlimit="0"
-       obsolete="false"
-       archived="false">
-       <result status="valid" time="0.00"/>
-      </proof>
-     </goal>
-     <goal
-      name="WP_parameter tc.4"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="148" loccnumb="10" loccnume="12"
-      expl="variant decreases"
-      sum="e59439b31fb7f997a8a4d950c6ec535f"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="144" loccnumb="10" loccnume="12"
+      expl="variant decrease"
+      sum="c7ff04a523aa449c93c1d5c3a5cb7b5d"
       proved="true"
       expanded="true"
-      shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VValexaTuple2ainfix +alengthV7alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3aTuple2ainfix +alengthV0alengthV1alengthV1Iainfix =V8V4aNiltaNiltF">
+      shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix &lt;alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthV7alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3Oainfix &lt;ainfix +alengthV7alengthaConsaTuple2ainfix -V8c1aNodeV9V5V3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1Iainfix =V8V4aNiltaNiltF">
       <label
        name="expl:parameter tc"/>
       <proof
@@ -611,14 +591,14 @@
       </proof>
      </goal>
      <goal
-      name="WP_parameter tc.5"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="148" loccnumb="10" loccnume="12"
-      expl="variant decreases"
-      sum="a96857c9a29cd78ad2f3e436e0fdecce"
+      name="WP_parameter tc.4"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="144" loccnumb="10" loccnume="12"
+      expl="variant decrease"
+      sum="5beeb2bca2e30a4b591f84be6822e8e4"
       proved="true"
       expanded="true"
-      shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VValexaTuple2ainfix +alengthaConsaTuple2V4V5V0alengthV3alengthV3aTuple2ainfix +alengthV0alengthV1alengthV1Iainfix =V8V4NaNiltaNiltF">
+      shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix &lt;alengthV3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthaConsaTuple2V4V5V0alengthV3Oainfix &lt;ainfix +alengthaConsaTuple2V4V5V0alengthV3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1Iainfix =V8V4NaNiltaNiltF">
       <label
        name="expl:parameter tc"/>
       <proof
@@ -631,14 +611,14 @@
       </proof>
      </goal>
      <goal
-      name="WP_parameter tc.6"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="148" loccnumb="10" loccnume="12"
-      expl="variant decreases"
-      sum="4cae64a55ff468affbf7cbd7f53f95c4"
+      name="WP_parameter tc.5"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="144" loccnumb="10" loccnume="12"
+      expl="variant decrease"
+      sum="4729a7c22bf84b7b4d87bfe78c827e68"
       proved="true"
       expanded="true"
-      shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVtaNilalexaTuple2ainfix +alengthaConsaTuple2V4V5aNilalengthV3alengthV3aTuple2ainfix +alengthV0alengthV1alengthV1aNiltF">
+      shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVtaNilainfix &lt;alengthV3alengthV1Aainfix &lt;=c0alengthV1Aainfix =ainfix +alengthV0alengthV1ainfix +alengthaConsaTuple2V4V5aNilalengthV3Oainfix &lt;ainfix +alengthaConsaTuple2V4V5aNilalengthV3ainfix +alengthV0alengthV1Aainfix &lt;=c0ainfix +alengthV0alengthV1aNiltF">
       <label
        name="expl:parameter tc"/>
       <proof
@@ -650,40 +630,20 @@
        <result status="valid" time="0.05"/>
       </proof>
      </goal>
-     <goal
-      name="WP_parameter tc.7"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="148" loccnumb="10" loccnume="12"
-      expl="exceptional postcondition"
-      sum="ea1b8a0e5ed26d90bd042d7903113526"
-      proved="true"
-      expanded="true"
-      shape="CV1aConsVVtaNiltF">
-      <label
-       name="expl:parameter tc"/>
-      <proof
-       prover="0"
-       timelimit="20"
-       memlimit="0"
-       obsolete="false"
-       archived="false">
-       <result status="valid" time="0.02"/>
-      </proof>
-     </goal>
     </transf>
    </goal>
   </theory>
   <theory
    name="ZipperBased"
-   locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-   loclnum="168" loccnumb="7" loccnume="18"
+   locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+   loclnum="162" loccnumb="7" loccnume="18"
    verified="true"
    expanded="true">
    <goal
     name="forest_depths_append"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="185" loccnumb="8" loccnume="28"
-    sum="d81e2bc29e419017e375e38886b452e6"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="178" loccnumb="8" loccnume="28"
+    sum="6a32b97530825478015cd8206061679e"
     proved="true"
     expanded="true"
     shape="ainfix =aforest_depthsainfix ++V0V1ainfix ++aforest_depthsV0aforest_depthsV1F">
@@ -699,9 +659,9 @@
    </goal>
    <goal
     name="g_append"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="209" loccnumb="8" loccnume="16"
-    sum="799bfd8357bea41dff6441ad85f7ed54"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="202" loccnumb="8" loccnume="16"
+    sum="66046f4f05afe35f8fe933cc70020cdf"
     proved="true"
     expanded="true"
     shape="agV0Iagainfix ++V0V1F">
@@ -717,9 +677,9 @@
    </goal>
    <goal
     name="right_nil"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="219" loccnumb="8" loccnume="17"
-    sum="f24c9a320cca5ef549b255bb67f728de"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="212" loccnumb="8" loccnume="17"
+    sum="2e57225995aa7d5dea1171facf242ec4"
     proved="true"
     expanded="true"
     shape="ainfix =aforest_depthsareverseV0adepthsV2V1NFIagV0Iainfix &gt;=alengthV0c2F">
@@ -735,9 +695,9 @@
    </goal>
    <goal
     name="main_lemma"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="227" loccnumb="8" loccnume="18"
-    sum="c2c0984d2d11e4e1391058b0445318d6"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="220" loccnumb="8" loccnume="18"
+    sum="a1735da54b0633ed80237df32ee51ae4"
     proved="true"
     expanded="true"
     shape="agaConsaTuple2V2V4aConsaTuple2V1V3V0ICV4aNodeVwagreedyV1ainfix +V2c1V5aLeaftIagaConsaTuple2V1V3V0Iainfix =V1V2NF">
@@ -753,10 +713,10 @@
    </goal>
    <goal
     name="WP_parameter tc"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="243" loccnumb="10" loccnume="12"
-    expl="exceptional postcondition"
-    sum="8f912c885bcbceadbb1aa845c4f9ffc4"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="236" loccnumb="10" loccnume="12"
+    expl="parameter tc"
+    sum="f665fd938dbc546c71566a566948609d"
     proved="true"
     expanded="true"
     shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VViainfix =V8V4ainfix =adepthsc0V10aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V11aforest_depthsainfix ++areverseV7aConsaTuple2ainfix -V8c1aNodeV9V5V3NFAainfix =adepthsc0V12aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V12aforest_depthsainfix ++areverseV7aConsaTuple2ainfix -V8c1aNodeV9V5V3FAagaConsaTuple2ainfix +ainfix -V8c1c1V9V7Aaonly_leafV3ACV7aConsaTuple2VVaNiltwtAagV7ainfix =adepthsc0V15aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V16aforest_depthsainfix ++areverseaConsaTuple2V4V5V0V3NFAainfix =adepthsc0V17aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V17aforest_depthsainfix ++areverseaConsaTuple2V4V5V0V3FACV3aConsaTuple2VVVCV19aNodeVwagaConsaTuple2ainfix +V18c1V21aConsaTuple2V4V5V0aLeaftAaonly_leafV20aNiltACV0aNilainfix =V3aNilNOainfix =V4c0NwtAagaConsaTuple2V4V5V0aNiliainfix =V4c0ainfix =adepthsc0V5aforest_depthsainfix ++areverseV0V1ainfix =adepthsc0V22aforest_depthsainfix ++areverseV0V1NFwCV2aTuple2VVCV0aConsVVCV25aTuple2VViainfix =V27V23ainfix =adepthsc0V29aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V30aforest_depthsainfix ++areverseV26aConsaTuple2ainfix -V27c1aNodeV28V24V3NFAainfix =adepthsc0V31aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V31aforest_depthsainfix ++areverseV26aConsaTuple2ainfix -V27c1aNodeV28V24V3FAagaConsaTuple2ainfix +ainfix -V27c1c1V28V26Aaonly_leafV3ACV26aConsaTuple2VVaNiltwtAagV26ainfix =adepthsc0V34aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V35aforest_depthsainfix ++areverseaConsaTuple2V23V24V0V3NFAainfix =adepthsc0V36aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V36aforest_depthsainfix ++areverseaConsaTuple2V23V24V0V3FACV3aConsaTuple2VVVCV38aNodeVwagaConsaTuple2ainfix +V37c1V40aConsaTuple2V23V24V0aLeaftAaonly_leafV39aNiltACV0aNilainfix =V3aNilNOainfix =V23c0NwtAagaConsaTuple2V23V24V0aNilainfix =adepthsc0V41aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V42aforest_depthsainfix ++areverseaConsaTuple2V23V24aNilV3NFAainfix =adepthsc0V43aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V43aforest_depthsainfix ++areverseaConsaTuple2V23V24aNilV3FACV3aConsaTuple2VVVCV45aNodeVwagaConsaTuple2ainfix +V44c1V47aConsaTuple2V23V24aNilaLeaftAaonly_leafV46aNiltAainfix =V3aNilNOainfix =V23c0NAagaConsaTuple2V23V24aNilaNilainfix =adepthsc0V48aforest_depthsainfix ++areverseV0V1NFICV1aConsaTuple2VVVCV50aNodeVwagaConsaTuple2ainfix +V49c1V52V0aLeaftAaonly_leafV51aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V53c0NwtAagV0F">
@@ -768,10 +728,10 @@
      expanded="true">
      <goal
       name="WP_parameter tc.1"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="precondition"
-      sum="fd88a4b9350e38484b0fcf256998f6b9"
+      sum="4073d5c336a6dd5a4c9ffed02b7ee55d"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVagaConsaTuple2ainfix +ainfix -V8c1c1V9V7Aaonly_leafV3ACV7aConsaTuple2VVaNiltwtAagV7Iainfix =V8V4aNiltwtaNiltICV1aConsaTuple2VVVCV13aNodeVwagaConsaTuple2ainfix +V12c1V15V0aLeaftAaonly_leafV14aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V16c0NwtAagV0F">
@@ -783,10 +743,10 @@
        expanded="true">
        <goal
         name="WP_parameter tc.1.1"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="07546e27a61e8a9f40d27368dd5d5439"
+        sum="cbfec93286ed611084827027e8c4398b"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVagV7Iainfix =V8V4aNiltwtaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -803,10 +763,10 @@
        </goal>
        <goal
         name="WP_parameter tc.1.2"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="470887454199351a8578981424dec812"
+        sum="5e61beadb745c9090aa261a2844dde44"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVaonly_leafV3Iainfix =V8V4aNiltwtaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -823,10 +783,10 @@
        </goal>
        <goal
         name="WP_parameter tc.1.3"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="d2952113b1481e9a0a390085ad5525b9"
+        sum="67d2f161e4ab1118bfda9fc8e64ad7f5"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVagaConsaTuple2ainfix +ainfix -V8c1c1V9V7Iainfix =V8V4aNiltwtaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -845,10 +805,10 @@
      </goal>
      <goal
       name="WP_parameter tc.2"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
-      expl="normal postcondition"
-      sum="5532352f9acd84b4b78a4baa9c356173"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
+      expl="postcondition"
+      sum="96ad5ebfff746e9e8b86ab04b265e948"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix =adepthsc0V10aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V10aforest_depthsainfix ++areverseV7aConsaTuple2ainfix -V8c1aNodeV9V5V3FIagaConsaTuple2ainfix +ainfix -V8c1c1V9V7Aaonly_leafV3ACV7aConsaTuple2VVaNiltwtAagV7Iainfix =V8V4aNiltwtaNiltICV1aConsaTuple2VVVCV14aNodeVwagaConsaTuple2ainfix +V13c1V16V0aLeaftAaonly_leafV15aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V17c0NwtAagV0F">
@@ -865,10 +825,10 @@
      </goal>
      <goal
       name="WP_parameter tc.3"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="exceptional postcondition"
-      sum="387f89bf4fb115764090c9c32c6d944d"
+      sum="81726e9554d5a76a4b788c14d9a18880"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix =adepthsc0V10aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V11aforest_depthsainfix ++areverseV7aConsaTuple2ainfix -V8c1aNodeV9V5V3NFIagaConsaTuple2ainfix +ainfix -V8c1c1V9V7Aaonly_leafV3ACV7aConsaTuple2VVaNiltwtAagV7Iainfix =V8V4aNiltwtaNiltICV1aConsaTuple2VVVCV15aNodeVwagaConsaTuple2ainfix +V14c1V17V0aLeaftAaonly_leafV16aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V18c0NwtAagV0F">
@@ -886,10 +846,10 @@
      </goal>
      <goal
       name="WP_parameter tc.4"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="precondition"
-      sum="47d967d0b46458e98bd20e620e72d6a2"
+      sum="57a87dca35ec24e85e97d121498c71ba"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVCV3aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13aConsaTuple2V4V5V0aLeaftAaonly_leafV12aNiltACV0aNilainfix =V3aNilNOainfix =V4c0NwtAagaConsaTuple2V4V5V0Iainfix =V8V4NaNiltwtaNiltICV1aConsaTuple2VVVCV15aNodeVwagaConsaTuple2ainfix +V14c1V17V0aLeaftAaonly_leafV16aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V18c0NwtAagV0F">
@@ -901,10 +861,10 @@
        expanded="true">
        <goal
         name="WP_parameter tc.4.1"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="36c6832666e4f3049222932b7d385602"
+        sum="0df888f57e1a096124f60981f7a0edae"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVagaConsaTuple2V4V5V0Iainfix =V8V4NaNiltwtaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -921,10 +881,10 @@
        </goal>
        <goal
         name="WP_parameter tc.4.2"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="7bf1b490e211c8d377bb335d783d71dc"
+        sum="30ca99427e848304440f4ffbfbfd87db"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVCV0aNilainfix =V3aNilNOainfix =V4c0NwtIainfix =V8V4NaNiltwtaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -941,10 +901,10 @@
        </goal>
        <goal
         name="WP_parameter tc.4.3"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="6e8be2f89525be3a5420d32483b285f3"
+        sum="59d394bdb9d62ce8b592b866615e156f"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVCV3aConsaTuple2VVVaonly_leafV12aNiltIainfix =V8V4NaNiltwtaNiltICV1aConsaTuple2VVVCV14aNodeVwagaConsaTuple2ainfix +V13c1V16V0aLeaftAaonly_leafV15aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V17c0NwtAagV0F">
@@ -961,10 +921,10 @@
        </goal>
        <goal
         name="WP_parameter tc.4.4"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="040e6ed87cc9627326f6bcf4711e4176"
+        sum="2eb82eebf66e0864a3692925e6ed449d"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVCV3aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13aConsaTuple2V4V5V0aLeaftaNiltIainfix =V8V4NaNiltwtaNiltICV1aConsaTuple2VVVCV15aNodeVwagaConsaTuple2ainfix +V14c1V17V0aLeaftAaonly_leafV16aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V18c0NwtAagV0F">
@@ -983,10 +943,10 @@
      </goal>
      <goal
       name="WP_parameter tc.5"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
-      expl="normal postcondition"
-      sum="8136572f0ef20f2b5338b704395c3c6a"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
+      expl="postcondition"
+      sum="4c866152a824fd31abbdab83b78d97d9"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix =adepthsc0V10aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V10aforest_depthsainfix ++areverseaConsaTuple2V4V5V0V3FICV3aConsaTuple2VVVCV12aNodeVwagaConsaTuple2ainfix +V11c1V14aConsaTuple2V4V5V0aLeaftAaonly_leafV13aNiltACV0aNilainfix =V3aNilNOainfix =V4c0NwtAagaConsaTuple2V4V5V0Iainfix =V8V4NaNiltwtaNiltICV1aConsaTuple2VVVCV16aNodeVwagaConsaTuple2ainfix +V15c1V18V0aLeaftAaonly_leafV17aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V19c0NwtAagV0F">
@@ -1011,10 +971,10 @@
      </goal>
      <goal
       name="WP_parameter tc.6"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="exceptional postcondition"
-      sum="fd02e0db3c2b28a47774b2024d3578ff"
+      sum="38cc4e7f367cce916a51024ebf728f88"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix =adepthsc0V10aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V11aforest_depthsainfix ++areverseaConsaTuple2V4V5V0V3NFICV3aConsaTuple2VVVCV13aNodeVwagaConsaTuple2ainfix +V12c1V15aConsaTuple2V4V5V0aLeaftAaonly_leafV14aNiltACV0aNilainfix =V3aNilNOainfix =V4c0NwtAagaConsaTuple2V4V5V0Iainfix =V8V4NaNiltwtaNiltICV1aConsaTuple2VVVCV17aNodeVwagaConsaTuple2ainfix +V16c1V19V0aLeaftAaonly_leafV18aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V20c0NwtAagV0F">
@@ -1039,10 +999,10 @@
      </goal>
      <goal
       name="WP_parameter tc.7"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
-      expl="normal postcondition"
-      sum="3da4b706789c8b23ea281c81f24db6f0"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
+      expl="postcondition"
+      sum="e49054009cc2543293476fbe4619408e"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVtaNilainfix =adepthsc0V5aforest_depthsainfix ++areverseV0V1Iainfix =V4c0wtaNiltICV1aConsaTuple2VVVCV9aNodeVwagaConsaTuple2ainfix +V8c1V11V0aLeaftAaonly_leafV10aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V12c0NwtAagV0F">
@@ -1059,10 +1019,10 @@
      </goal>
      <goal
       name="WP_parameter tc.8"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="exceptional postcondition"
-      sum="df68e002b78e94e2afee50baa4a16ef7"
+      sum="a5c5485d1b284e866c82beeb95022136"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNilCV2aTuple2VVCV0aConsVVtaNilainfix =adepthsc0V8aforest_depthsainfix ++areverseV0V1NFIainfix =V4c0NwtaNiltICV1aConsaTuple2VVVCV10aNodeVwagaConsaTuple2ainfix +V9c1V12V0aLeaftAaonly_leafV11aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V13c0NwtAagV0F">
@@ -1079,10 +1039,10 @@
      </goal>
      <goal
       name="WP_parameter tc.9"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="precondition"
-      sum="04074ade419fedbd408260a30d4ecc1b"
+      sum="f48033b7fec30e7b13da05895c8f64a1"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVagaConsaTuple2ainfix +ainfix -V8c1c1V9V7Aaonly_leafV3ACV7aConsaTuple2VVaNiltwtAagV7Iainfix =V8V4aNiltaNiltICV1aConsaTuple2VVVCV13aNodeVwagaConsaTuple2ainfix +V12c1V15V0aLeaftAaonly_leafV14aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V16c0NwtAagV0F">
@@ -1094,10 +1054,10 @@
        expanded="true">
        <goal
         name="WP_parameter tc.9.1"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="4c33447cda8a51320038249b8dbbaf24"
+        sum="bdcefe68dd9c672fad616452e4ef5ae8"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVagV7Iainfix =V8V4aNiltaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -1114,10 +1074,10 @@
        </goal>
        <goal
         name="WP_parameter tc.9.2"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="9a2536f36f0b12ef3e41103fbce639ef"
+        sum="ccc636da413e83a10e9df34297cd32d5"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVaonly_leafV3Iainfix =V8V4aNiltaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -1134,10 +1094,10 @@
        </goal>
        <goal
         name="WP_parameter tc.9.3"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="6b0f0e165df35d9184daf8a3218925f0"
+        sum="fd64420b02632fc53d9dd295b3b06930"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVagaConsaTuple2ainfix +ainfix -V8c1c1V9V7Iainfix =V8V4aNiltaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -1156,10 +1116,10 @@
      </goal>
      <goal
       name="WP_parameter tc.10"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
-      expl="normal postcondition"
-      sum="3300a8799a7c293c734046ffa04ba2d7"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
+      expl="postcondition"
+      sum="f9c377824eec5372f10d43e9303729b0"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix =adepthsc0V10aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V10aforest_depthsainfix ++areverseV7aConsaTuple2ainfix -V8c1aNodeV9V5V3FIagaConsaTuple2ainfix +ainfix -V8c1c1V9V7Aaonly_leafV3ACV7aConsaTuple2VVaNiltwtAagV7Iainfix =V8V4aNiltaNiltICV1aConsaTuple2VVVCV14aNodeVwagaConsaTuple2ainfix +V13c1V16V0aLeaftAaonly_leafV15aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V17c0NwtAagV0F">
@@ -1177,10 +1137,10 @@
      </goal>
      <goal
       name="WP_parameter tc.11"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="exceptional postcondition"
-      sum="b5a394c173146d9a8c92651ce762fda9"
+      sum="62017dfbe019047a8eaa10481ab344fc"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix =adepthsc0V10aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V11aforest_depthsainfix ++areverseV7aConsaTuple2ainfix -V8c1aNodeV9V5V3NFIagaConsaTuple2ainfix +ainfix -V8c1c1V9V7Aaonly_leafV3ACV7aConsaTuple2VVaNiltwtAagV7Iainfix =V8V4aNiltaNiltICV1aConsaTuple2VVVCV15aNodeVwagaConsaTuple2ainfix +V14c1V17V0aLeaftAaonly_leafV16aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V18c0NwtAagV0F">
@@ -1198,10 +1158,10 @@
      </goal>
      <goal
       name="WP_parameter tc.12"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="precondition"
-      sum="4dfeead87c74beae68dc1ec7935a09c5"
+      sum="4bec99f7f9353e3fa21a8e14b4544a2b"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVCV3aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13aConsaTuple2V4V5V0aLeaftAaonly_leafV12aNiltACV0aNilainfix =V3aNilNOainfix =V4c0NwtAagaConsaTuple2V4V5V0Iainfix =V8V4NaNiltaNiltICV1aConsaTuple2VVVCV15aNodeVwagaConsaTuple2ainfix +V14c1V17V0aLeaftAaonly_leafV16aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V18c0NwtAagV0F">
@@ -1213,10 +1173,10 @@
        expanded="true">
        <goal
         name="WP_parameter tc.12.1"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="e890a6922479471a7cfc0c888237f541"
+        sum="d8609f015cbe514225f6b47917c682e4"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVagaConsaTuple2V4V5V0Iainfix =V8V4NaNiltaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -1233,10 +1193,10 @@
        </goal>
        <goal
         name="WP_parameter tc.12.2"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="6c6782a031470ed55928a72b2331e202"
+        sum="c3ef29c98915e19274b7870aed7143bd"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVCV0aNilainfix =V3aNilNOainfix =V4c0NwtIainfix =V8V4NaNiltaNiltICV1aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13V0aLeaftAaonly_leafV12aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V14c0NwtAagV0F">
@@ -1253,10 +1213,10 @@
        </goal>
        <goal
         name="WP_parameter tc.12.3"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="9e896453ee2c98eab133d51e1761176a"
+        sum="51f4d1f2672b151d64f8994fdd5f24d9"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVCV3aConsaTuple2VVVaonly_leafV12aNiltIainfix =V8V4NaNiltaNiltICV1aConsaTuple2VVVCV14aNodeVwagaConsaTuple2ainfix +V13c1V16V0aLeaftAaonly_leafV15aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V17c0NwtAagV0F">
@@ -1273,10 +1233,10 @@
        </goal>
        <goal
         name="WP_parameter tc.12.4"
-        locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-        loclnum="243" loccnumb="10" loccnume="12"
+        locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+        loclnum="236" loccnumb="10" loccnume="12"
         expl="parameter tc"
-        sum="0e63f5bc45ec3529c3e5815a02431cde"
+        sum="b5dfb2f320ea9174c5db79442a045d3c"
         proved="true"
         expanded="true"
         shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVCV3aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13aConsaTuple2V4V5V0aLeaftaNiltIainfix =V8V4NaNiltaNiltICV1aConsaTuple2VVVCV15aNodeVwagaConsaTuple2ainfix +V14c1V17V0aLeaftAaonly_leafV16aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V18c0NwtAagV0F">
@@ -1295,10 +1255,10 @@
      </goal>
      <goal
       name="WP_parameter tc.13"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
-      expl="normal postcondition"
-      sum="c61b131960045daee67a8a4ff245cc10"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
+      expl="postcondition"
+      sum="3af9c31028c87f01cf67c87d8026aafd"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix =adepthsc0V10aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V10aforest_depthsainfix ++areverseaConsaTuple2V4V5V0V3FICV3aConsaTuple2VVVCV12aNodeVwagaConsaTuple2ainfix +V11c1V14aConsaTuple2V4V5V0aLeaftAaonly_leafV13aNiltACV0aNilainfix =V3aNilNOainfix =V4c0NwtAagaConsaTuple2V4V5V0Iainfix =V8V4NaNiltaNiltICV1aConsaTuple2VVVCV16aNodeVwagaConsaTuple2ainfix +V15c1V18V0aLeaftAaonly_leafV17aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V19c0NwtAagV0F">
@@ -1323,10 +1283,10 @@
      </goal>
      <goal
       name="WP_parameter tc.14"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="exceptional postcondition"
-      sum="9edb12662e9832a8208c5b94bb0d08ae"
+      sum="2176dbc5f71ad95b5459e1a5c1de331a"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVCV6aTuple2VVainfix =adepthsc0V10aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V11aforest_depthsainfix ++areverseaConsaTuple2V4V5V0V3NFICV3aConsaTuple2VVVCV13aNodeVwagaConsaTuple2ainfix +V12c1V15aConsaTuple2V4V5V0aLeaftAaonly_leafV14aNiltACV0aNilainfix =V3aNilNOainfix =V4c0NwtAagaConsaTuple2V4V5V0Iainfix =V8V4NaNiltaNiltICV1aConsaTuple2VVVCV17aNodeVwagaConsaTuple2ainfix +V16c1V19V0aLeaftAaonly_leafV18aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V20c0NwtAagV0F">
@@ -1359,10 +1319,10 @@
      </goal>
      <goal
       name="WP_parameter tc.15"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="precondition"
-      sum="7c81947d43745ae8bce4c8133a0420c8"
+      sum="e61a74417a8d900a3561cbe4a745197b"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVtaNilCV3aConsaTuple2VVVCV9aNodeVwagaConsaTuple2ainfix +V8c1V11aConsaTuple2V4V5aNilaLeaftAaonly_leafV10aNiltAainfix =V3aNilNOainfix =V4c0NAagaConsaTuple2V4V5aNilaNiltICV1aConsaTuple2VVVCV13aNodeVwagaConsaTuple2ainfix +V12c1V15V0aLeaftAaonly_leafV14aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V16c0NwtAagV0F">
@@ -1387,10 +1347,10 @@
      </goal>
      <goal
       name="WP_parameter tc.16"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
-      expl="normal postcondition"
-      sum="2e8ab96ec91ddf81392587741135d3f0"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
+      expl="postcondition"
+      sum="5ac8e26e50f0cc8a956debca387bf6ac"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVtaNilainfix =adepthsc0V8aforest_depthsainfix ++areverseV0V1Iainfix =adepthsc0V8aforest_depthsainfix ++areverseaConsaTuple2V4V5aNilV3FICV3aConsaTuple2VVVCV10aNodeVwagaConsaTuple2ainfix +V9c1V12aConsaTuple2V4V5aNilaLeaftAaonly_leafV11aNiltAainfix =V3aNilNOainfix =V4c0NAagaConsaTuple2V4V5aNilaNiltICV1aConsaTuple2VVVCV14aNodeVwagaConsaTuple2ainfix +V13c1V16V0aLeaftAaonly_leafV15aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V17c0NwtAagV0F">
@@ -1415,10 +1375,10 @@
      </goal>
      <goal
       name="WP_parameter tc.17"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="exceptional postcondition"
-      sum="8228dada86d8a4329c9cbcdcdf639450"
+      sum="4a6150b11b1517817b0523fe7ffc497f"
       proved="true"
       expanded="true"
       shape="CV1aConsVVCV3aNiltwCV2aTuple2VVCV0aConsVVtaNilainfix =adepthsc0V8aforest_depthsainfix ++areverseV0V1NFIainfix =adepthsc0V9aforest_depthsainfix ++areverseaConsaTuple2V4V5aNilV3NFICV3aConsaTuple2VVVCV11aNodeVwagaConsaTuple2ainfix +V10c1V13aConsaTuple2V4V5aNilaLeaftAaonly_leafV12aNiltAainfix =V3aNilNOainfix =V4c0NAagaConsaTuple2V4V5aNilaNiltICV1aConsaTuple2VVVCV15aNodeVwagaConsaTuple2ainfix +V14c1V17V0aLeaftAaonly_leafV16aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V18c0NwtAagV0F">
@@ -1451,10 +1411,10 @@
      </goal>
      <goal
       name="WP_parameter tc.18"
-      locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-      loclnum="243" loccnumb="10" loccnume="12"
+      locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+      loclnum="236" loccnumb="10" loccnume="12"
       expl="exceptional postcondition"
-      sum="7afdf91d3acf93ba2579f895acbd5e61"
+      sum="19e54363eef247656dfc807cc613fc54"
       proved="true"
       expanded="true"
       shape="CV1aConsVVtaNilainfix =adepthsc0V4aforest_depthsainfix ++areverseV0V1NFICV1aConsaTuple2VVVCV6aNodeVwagaConsaTuple2ainfix +V5c1V8V0aLeaftAaonly_leafV7aNiltACV0aConsaTuple2VVaNilainfix =V1aNilNOainfix =V9c0NwtAagV0F">
@@ -1473,9 +1433,9 @@
    </goal>
    <goal
     name="map_leaf_depths"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="285" loccnumb="8" loccnume="23"
-    sum="15a33c5e4dda8d9c71abe20cfefb65d4"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="277" loccnumb="8" loccnume="23"
+    sum="22c50aec49d95297e5f72bc9d8022d80"
     proved="true"
     expanded="true"
     shape="ainfix =aforest_depthsamap_leafV0V0F">
@@ -1491,9 +1451,9 @@
    </goal>
    <goal
     name="map_leaf_only_leaf"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="288" loccnumb="8" loccnume="26"
-    sum="f298c705bc66d7754683905ac8d21c9b"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="280" loccnumb="8" loccnume="26"
+    sum="ba63f1339ca478356cabee362cc67516"
     proved="true"
     expanded="true"
     shape="aonly_leafamap_leafV0F">
@@ -1509,10 +1469,10 @@
    </goal>
    <goal
     name="WP_parameter build"
-    locfile="examples/programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
-    loclnum="291" loccnumb="6" loccnume="11"
+    locfile="programs/vstte12_tree_reconstruction/../vstte12_tree_reconstruction.mlw"
+    loclnum="283" loccnumb="6" loccnume="11"
     expl="parameter build"
-    sum="ee4e94993d4777b62e88d25ffecfdf3d"
+    sum="941fd7e21ecb84afbef64791d8dc7ad3"
     proved="true"
     expanded="true"
     shape="ainfix =adepthsc0V1V0NFIainfix =adepthsc0V2aforest_depthsainfix ++areverseaNilamap_leafV0NFAainfix =adepthsc0V3V0Iainfix =adepthsc0V3aforest_depthsainfix ++areverseaNilamap_leafV0FACamap_leafV0aConsaTuple2VVVCV5aNodeVwagaConsaTuple2ainfix +V4c1V7aNilaLeaftAaonly_leafV6aNiltAagaNilF">