diff --git a/sessions/_parse_integer_fixup_radix.av/whole_program/why3session.xml b/sessions/_parse_integer_fixup_radix.av/whole_program/why3session.xml
index 64fe3ac..5b51ebe 100644
--- a/sessions/_parse_integer_fixup_radix.av/whole_program/why3session.xml
+++ b/sessions/_parse_integer_fixup_radix.av/whole_program/why3session.xml
@@ -949,29 +949,29 @@
 </theory>
 <theory name="Function__parse_integer_fixup_radix_safety" sum="e1ecc0d015449beaa4c58a6c495172b7" expanded="true">
  <goal name="WP_parameter _parse_integer_fixup_radix" expl="Function _parse_integer_fixup_radix, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.09"/></proof>
+ <proof prover="1"><result status="valid" time="0.10"/></proof>
  </goal>
 </theory>
 <theory name="Function__parse_integer_fixup_radix_behaviors" sum="ccccd7245da959158eb64de49ad1b74b" expanded="true">
  <goal name="WP_parameter _parse_integer_fixup_radix_ensures_default" expl="Function _parse_integer_fixup_radix, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="0.14"/></proof>
+ <proof prover="1"><result status="valid" time="0.18"/></proof>
  </goal>
  <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess" expl="Function _parse_integer_fixup_radix, behavior guess" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.1" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.19" steps="1443"/></proof>
+  <proof prover="0"><result status="valid" time="0.21" steps="1443"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.2" expl="Postcondition (Ensures clause)">
   <proof prover="0"><result status="valid" time="0.03" steps="141"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.3" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.03" steps="129"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="129"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.4" expl="Postcondition (Ensures clause)">
   <proof prover="0"><result status="valid" time="0.03" steps="121"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.5" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.01" steps="108"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="108"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.6" expl="Postcondition (Ensures clause)">
   <proof prover="0"><result status="valid" time="0.02" steps="108"/></proof>
@@ -986,28 +986,28 @@
   <proof prover="0"><result status="valid" time="0.01" steps="100"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.10" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.01" steps="100"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="100"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.11" expl="Postcondition (Ensures clause)">
   <proof prover="0"><result status="valid" time="0.02" steps="100"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.12" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.21" steps="813"/></proof>
+  <proof prover="0"><result status="valid" time="0.23" steps="813"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.13" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.01" steps="88"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="88"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.14" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.01" steps="88"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="88"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.15" expl="Postcondition (Ensures clause)">
   <proof prover="0"><result status="valid" time="0.01" steps="88"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.16" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.22" steps="1675"/></proof>
+  <proof prover="0"><result status="valid" time="0.25" steps="1675"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.17" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.02" steps="107"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="107"/></proof>
   </goal>
   <goal name="WP_parameter _parse_integer_fixup_radix_ensures_guess.18" expl="Postcondition (Ensures clause)">
   <proof prover="0"><result status="valid" time="0.02" steps="103"/></proof>
@@ -1021,7 +1021,7 @@
  </transf>
  </goal>
  <goal name="WP_parameter _parse_integer_fixup_radix_ensures_shift" expl="Function _parse_integer_fixup_radix, behavior shift" expanded="true">
- <proof prover="1"><result status="valid" time="0.74"/></proof>
+ <proof prover="1"><result status="valid" time="1.12"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/check_bytes8.av/whole_program/why3session.xml b/sessions/check_bytes8.av/whole_program/why3session.xml
index 5e2620d..237c131 100644
--- a/sessions/check_bytes8.av/whole_program/why3session.xml
+++ b/sessions/check_bytes8.av/whole_program/why3session.xml
@@ -793,7 +793,7 @@
 </theory>
 <theory name="Function_check_bytes8_0_safety" sum="f214dc0feff67b31e8151b86412f139d" expanded="true">
  <goal name="WP_parameter check_bytes8_0" expl="Function check_bytes8, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.09"/></proof>
+ <proof prover="1"><result status="valid" time="0.11"/></proof>
  </goal>
 </theory>
 <theory name="Function_check_bytes8_0_behaviors" sum="56f6c92a103ac54a5d98c66f41419a6d" expanded="true">
@@ -806,13 +806,13 @@
   <proof prover="0"><result status="valid" time="0.01" steps="20"/></proof>
   </goal>
   <goal name="WP_parameter check_bytes8_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.10" steps="783"/></proof>
+  <proof prover="0"><result status="valid" time="0.11" steps="783"/></proof>
   </goal>
   <goal name="WP_parameter check_bytes8_ensures_default.4" expl="Ensures clause (Postcondition)">
   <proof prover="0"><result status="valid" time="0.02" steps="199"/></proof>
   </goal>
   <goal name="WP_parameter check_bytes8_ensures_default.5" expl="loop invariant preservation">
-  <proof prover="0"><result status="valid" time="1.20" steps="1632"/></proof>
+  <proof prover="0"><result status="valid" time="1.28" steps="1632"/></proof>
   </goal>
   <goal name="WP_parameter check_bytes8_ensures_default.6" expl="Assertion in line 23">
   <proof prover="0"><result status="valid" time="0.01" steps="36"/></proof>
@@ -826,10 +826,10 @@
  </transf>
  </goal>
  <goal name="WP_parameter check_bytes8_ensures_found" expl="Function check_bytes8, behavior found" expanded="true">
- <proof prover="1"><result status="valid" time="0.14"/></proof>
+ <proof prover="1"><result status="valid" time="0.17"/></proof>
  </goal>
  <goal name="WP_parameter check_bytes8_ensures_not_exists" expl="Function check_bytes8, behavior not_exists" expanded="true">
- <proof prover="0"><result status="valid" time="0.02" steps="220"/></proof>
+ <proof prover="0"><result status="valid" time="0.03" steps="220"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/kstrtobool.av/whole_program/why3session.xml b/sessions/kstrtobool.av/whole_program/why3session.xml
index 18b14ec..2c6d00e 100644
--- a/sessions/kstrtobool.av/whole_program/why3session.xml
+++ b/sessions/kstrtobool.av/whole_program/why3session.xml
@@ -895,7 +895,7 @@
 </theory>
 <theory name="Function_kstrtobool_safety" sum="1e29c951c5acfdd4394a74fea1cfa2e6" expanded="true">
  <goal name="WP_parameter kstrtobool" expl="Function kstrtobool, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.07"/></proof>
+ <proof prover="1"><result status="valid" time="0.08"/></proof>
  </goal>
 </theory>
 <theory name="Function_kstrtobool_behaviors" sum="d2894b22a99feb3792f47c6caef638b4" expanded="true">
@@ -905,10 +905,10 @@
   <proof prover="0"><result status="valid" time="0.01" steps="20"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.2" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.03" steps="431"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="431"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.3" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.03" steps="390"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="390"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.4" expl="Postcondition">
   <proof prover="0"><result status="valid" time="0.04" steps="401"/></proof>
@@ -917,40 +917,40 @@
   <proof prover="0"><result status="valid" time="0.05" steps="569"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.6" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.04" steps="436"/></proof>
+  <proof prover="0"><result status="valid" time="0.05" steps="436"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.7" expl="Postcondition">
   <proof prover="0"><result status="valid" time="0.04" steps="455"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.8" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.07" steps="860"/></proof>
+  <proof prover="0"><result status="valid" time="0.08" steps="860"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.9" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.07" steps="758"/></proof>
+  <proof prover="0"><result status="valid" time="0.08" steps="758"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.10" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.07" steps="860"/></proof>
+  <proof prover="0"><result status="valid" time="0.08" steps="860"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.11" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.08" steps="881"/></proof>
+  <proof prover="0"><result status="valid" time="0.09" steps="881"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.12" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.09" steps="876"/></proof>
+  <proof prover="0"><result status="valid" time="0.10" steps="876"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.13" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.07" steps="757"/></proof>
+  <proof prover="0"><result status="valid" time="0.08" steps="757"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.14" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.09" steps="939"/></proof>
+  <proof prover="0"><result status="valid" time="0.10" steps="939"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.15" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.08" steps="881"/></proof>
+  <proof prover="0"><result status="valid" time="0.09" steps="881"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.16" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.07" steps="844"/></proof>
+  <proof prover="0"><result status="valid" time="0.08" steps="844"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.17" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.09" steps="889"/></proof>
+  <proof prover="0"><result status="valid" time="0.11" steps="889"/></proof>
   </goal>
   <goal name="WP_parameter kstrtobool_ensures_CORRECT.18" expl="Postcondition">
   <proof prover="0"><result status="valid" time="0.04" steps="457"/></proof>
@@ -958,10 +958,10 @@
  </transf>
  </goal>
  <goal name="WP_parameter kstrtobool_ensures_INVAL" expl="Function kstrtobool, behavior INVAL" expanded="true">
- <proof prover="1"><result status="valid" time="0.11"/></proof>
+ <proof prover="1"><result status="valid" time="0.13"/></proof>
  </goal>
  <goal name="WP_parameter kstrtobool_ensures_default" expl="Function kstrtobool, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="0.09"/></proof>
+ <proof prover="1"><result status="valid" time="0.11"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/match_string.av/whole_program/why3session.xml b/sessions/match_string.av/whole_program/why3session.xml
index a9f6395..bdd803b 100644
--- a/sessions/match_string.av/whole_program/why3session.xml
+++ b/sessions/match_string.av/whole_program/why3session.xml
@@ -849,37 +849,37 @@
 </theory>
 <theory name="Function_match_string_0_safety" sum="1f8cc5c24984d52512517b21ae5a2b91" expanded="true">
  <goal name="WP_parameter match_string_0" expl="Function match_string, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.16"/></proof>
+ <proof prover="1"><result status="valid" time="0.18"/></proof>
  </goal>
 </theory>
 <theory name="Function_match_string_0_behaviors" sum="2f161d4328733cc19f2abd76a447ae37" expanded="true">
  <goal name="WP_parameter match_string_ensures_default" expl="Function match_string, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter match_string_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.03" steps="151"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="151"/></proof>
   </goal>
   <goal name="WP_parameter match_string_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.03" steps="149"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="149"/></proof>
   </goal>
   <goal name="WP_parameter match_string_ensures_default.3" expl="loop invariant init">
-  <proof prover="1"><result status="valid" time="0.21"/></proof>
+  <proof prover="1"><result status="valid" time="0.25"/></proof>
   </goal>
   <goal name="WP_parameter match_string_ensures_default.4" expl="Assertion in line 21">
-  <proof prover="0"><result status="valid" time="0.10" steps="912"/></proof>
+  <proof prover="0"><result status="valid" time="0.12" steps="912"/></proof>
   </goal>
   <goal name="WP_parameter match_string_ensures_default.5" expl="Assertion in line 25">
-  <proof prover="0"><result status="valid" time="1.17" steps="9248"/></proof>
+  <proof prover="0"><result status="valid" time="1.31" steps="9979"/></proof>
   </goal>
   <goal name="WP_parameter match_string_ensures_default.6" expl="loop invariant preservation">
-  <proof prover="0"><result status="valid" time="0.28" steps="2440"/></proof>
+  <proof prover="0"><result status="valid" time="0.31" steps="2440"/></proof>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter match_string_ensures_exists" expl="Function match_string, behavior exists" expanded="true">
- <proof prover="0"><result status="valid" time="1.31" steps="6472"/></proof>
+ <proof prover="0"><result status="valid" time="1.43" steps="6471"/></proof>
  </goal>
  <goal name="WP_parameter match_string_ensures_missing" expl="Function match_string, behavior missing" expanded="true">
- <proof prover="0"><result status="valid" time="0.28" steps="2393"/></proof>
+ <proof prover="0"><result status="valid" time="0.33" steps="2393"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/memchr.av/whole_program/why3session.xml b/sessions/memchr.av/whole_program/why3session.xml
index d812564..4b7cb4f 100644
--- a/sessions/memchr.av/whole_program/why3session.xml
+++ b/sessions/memchr.av/whole_program/why3session.xml
@@ -780,7 +780,7 @@
 </theory>
 <theory name="Function_memchr_safety" sum="fb441ee9bf53de800dfc8a2f5436ac31" expanded="true">
  <goal name="WP_parameter memchr" expl="Function memchr, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.13" steps="840"/></proof>
+ <proof prover="0"><result status="valid" time="0.15" steps="840"/></proof>
  </goal>
 </theory>
 <theory name="Function_memchr_behaviors" sum="cc395d0f49147f835a4659cd06a70128" expanded="true">
@@ -790,13 +790,13 @@
   <proof prover="0"><result status="valid" time="0.03" steps="157"/></proof>
   </goal>
   <goal name="WP_parameter memchr_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="155"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="155"/></proof>
   </goal>
   <goal name="WP_parameter memchr_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.31" steps="1788"/></proof>
+  <proof prover="0"><result status="valid" time="0.35" steps="1788"/></proof>
   </goal>
   <goal name="WP_parameter memchr_ensures_default.4" expl="loop invariant preservation">
-  <proof prover="0"><result status="valid" time="0.31" steps="1304"/></proof>
+  <proof prover="0"><result status="valid" time="0.34" steps="1304"/></proof>
   </goal>
   <goal name="WP_parameter memchr_ensures_default.5" expl="Assertion in line 18">
   <proof prover="0"><result status="valid" time="0.04" steps="290"/></proof>
@@ -804,10 +804,10 @@
  </transf>
  </goal>
  <goal name="WP_parameter memchr_ensures_found" expl="Function memchr, behavior found" expanded="true">
- <proof prover="0"><result status="valid" time="1.60" steps="7308"/></proof>
+ <proof prover="0"><result status="valid" time="1.80" steps="7308"/></proof>
  </goal>
  <goal name="WP_parameter memchr_ensures_not_exists" expl="Function memchr, behavior not_exists" expanded="true">
- <proof prover="0"><result status="valid" time="0.05" steps="426"/></proof>
+ <proof prover="0"><result status="valid" time="0.06" steps="426"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/memcmp.av/whole_program/why3session.xml b/sessions/memcmp.av/whole_program/why3session.xml
index 49b9c82..ad2cdc2 100644
--- a/sessions/memcmp.av/whole_program/why3session.xml
+++ b/sessions/memcmp.av/whole_program/why3session.xml
@@ -781,7 +781,7 @@
 </theory>
 <theory name="Function_memcmp_safety" sum="e7499e1c0257461e76c4cc03b9ffb17d" expanded="true">
  <goal name="WP_parameter memcmp" expl="Function memcmp, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.11"/></proof>
+ <proof prover="1"><result status="valid" time="0.13"/></proof>
  </goal>
 </theory>
 <theory name="Function_memcmp_behaviors" sum="f55880b5e5b70879e6b7df035e876764" expanded="true">
@@ -794,18 +794,18 @@
   <proof prover="0"><result status="valid" time="0.01" steps="28"/></proof>
   </goal>
   <goal name="WP_parameter memcmp_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.09" steps="992"/></proof>
+  <proof prover="0"><result status="valid" time="0.10" steps="992"/></proof>
   </goal>
   <goal name="WP_parameter memcmp_ensures_default.4" expl="loop invariant preservation">
-  <proof prover="0"><result status="valid" time="0.40" steps="3146"/></proof>
+  <proof prover="0"><result status="valid" time="0.45" steps="3146"/></proof>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter memcmp_ensures_diff" expl="Function memcmp, behavior diff" expanded="true">
- <proof prover="1"><result status="valid" time="0.22"/></proof>
+ <proof prover="1"><result status="valid" time="0.29"/></proof>
  </goal>
  <goal name="WP_parameter memcmp_ensures_equal" expl="Function memcmp, behavior equal" expanded="true">
- <proof prover="0"><result status="valid" time="0.07" steps="668"/></proof>
+ <proof prover="0"><result status="valid" time="0.08" steps="668"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/memcpy.av/whole_program/why3session.xml b/sessions/memcpy.av/whole_program/why3session.xml
index cd44f2d..d132cc1 100644
--- a/sessions/memcpy.av/whole_program/why3session.xml
+++ b/sessions/memcpy.av/whole_program/why3session.xml
@@ -773,20 +773,20 @@
 </theory>
 <theory name="Function_memcpy_safety" sum="0509ec78fd985bc6e247532ffc16630d" expanded="true">
  <goal name="WP_parameter memcpy" expl="Function memcpy, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.20" steps="1134"/></proof>
+ <proof prover="0"><result status="valid" time="0.22" steps="1134"/></proof>
  </goal>
 </theory>
 <theory name="Function_memcpy_behaviors" sum="487a640bac9a93147f3a631a74ab740c" expanded="true">
  <goal name="WP_parameter memcpy_ensures_default" expl="Function memcpy, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter memcpy_ensures_default.1" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.92" steps="3445"/></proof>
+  <proof prover="0"><result status="valid" time="1.08" steps="3445"/></proof>
   </goal>
   <goal name="WP_parameter memcpy_ensures_default.2" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.21"/></proof>
+  <proof prover="1"><result status="valid" time="0.32"/></proof>
   </goal>
   <goal name="WP_parameter memcpy_ensures_default.3" expl="Assertion in line 20">
-  <proof prover="0"><result status="valid" time="0.05" steps="383"/></proof>
+  <proof prover="0"><result status="valid" time="0.06" steps="383"/></proof>
   </goal>
   <goal name="WP_parameter memcpy_ensures_default.4" expl="Postcondition">
   <proof prover="0"><result status="valid" time="0.03" steps="211"/></proof>
diff --git a/sessions/memmove.av/whole_program/why3session.xml b/sessions/memmove.av/whole_program/why3session.xml
index 5e255bb..44ac0c5 100644
--- a/sessions/memmove.av/whole_program/why3session.xml
+++ b/sessions/memmove.av/whole_program/why3session.xml
@@ -783,19 +783,19 @@
   <proof prover="0"><result status="valid" time="0.02" steps="151"/></proof>
   </goal>
   <goal name="WP_parameter memmove.4" expl="Integer cast (integer overflow)">
-  <proof prover="0"><result status="valid" time="0.02" steps="196"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="196"/></proof>
   </goal>
   <goal name="WP_parameter memmove.5" expl="Integer cast (integer overflow)">
-  <proof prover="0"><result status="valid" time="0.02" steps="199"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="199"/></proof>
   </goal>
   <goal name="WP_parameter memmove.6" expl="Pointer dereference (Validity)">
-  <proof prover="0"><result status="valid" time="0.16" steps="773"/></proof>
+  <proof prover="0"><result status="valid" time="0.28" steps="773"/></proof>
   </goal>
   <goal name="WP_parameter memmove.7" expl="Pointer dereference (Assignment)">
-  <proof prover="0"><result status="valid" time="0.17" steps="781"/></proof>
+  <proof prover="0"><result status="valid" time="0.20" steps="781"/></proof>
   </goal>
   <goal name="WP_parameter memmove.8" expl="loop variant decrease">
-  <proof prover="0"><result status="valid" time="0.03" steps="301"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="301"/></proof>
   </goal>
   <goal name="WP_parameter memmove.9" expl="Downcast">
   <proof prover="0"><result status="valid" time="0.02" steps="149"/></proof>
@@ -804,16 +804,16 @@
   <proof prover="0"><result status="valid" time="0.02" steps="153"/></proof>
   </goal>
   <goal name="WP_parameter memmove.11" expl="Integer cast (integer overflow)">
-  <proof prover="0"><result status="valid" time="0.02" steps="198"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="198"/></proof>
   </goal>
   <goal name="WP_parameter memmove.12" expl="Integer cast (integer overflow)">
   <proof prover="0"><result status="valid" time="0.02" steps="199"/></proof>
   </goal>
   <goal name="WP_parameter memmove.13" expl="Pointer dereference (Validity)">
-  <proof prover="0"><result status="valid" time="0.20" steps="839"/></proof>
+  <proof prover="0"><result status="valid" time="0.27" steps="839"/></proof>
   </goal>
   <goal name="WP_parameter memmove.14" expl="Pointer dereference (Assignment)">
-  <proof prover="0"><result status="valid" time="0.19" steps="855"/></proof>
+  <proof prover="0"><result status="valid" time="0.26" steps="855"/></proof>
   </goal>
   <goal name="WP_parameter memmove.15" expl="loop variant decrease">
   <proof prover="0"><result status="valid" time="0.04" steps="309"/></proof>
@@ -825,91 +825,91 @@
  <goal name="WP_parameter memmove_ensures_default" expl="Function memmove, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter memmove_ensures_default.1" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.92" steps="3724"/></proof>
+  <proof prover="0"><result status="valid" time="0.96" steps="3236"/></proof>
   </goal>
   <goal name="WP_parameter memmove_ensures_default.2" expl="Assertion in line 22">
-  <proof prover="0"><result status="valid" time="0.23" steps="943"/></proof>
+  <proof prover="0"><result status="valid" time="0.26" steps="943"/></proof>
   </goal>
   <goal name="WP_parameter memmove_ensures_default.3" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.37"/></proof>
+  <proof prover="1"><result status="valid" time="0.50"/></proof>
   </goal>
   <goal name="WP_parameter memmove_ensures_default.4" expl="Assertion in line 42">
-  <proof prover="0"><result status="valid" time="0.05" steps="387"/></proof>
+  <proof prover="0"><result status="valid" time="0.06" steps="387"/></proof>
   </goal>
   <goal name="WP_parameter memmove_ensures_default.5" expl="Assigns clause (Postcondition)">
   <proof prover="0"><result status="valid" time="0.02" steps="195"/></proof>
   </goal>
   <goal name="WP_parameter memmove_ensures_default.6" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.82" steps="3453"/></proof>
+  <proof prover="0"><result status="valid" time="1.03" steps="3453"/></proof>
   </goal>
   <goal name="WP_parameter memmove_ensures_default.7" expl="Assertion in line 39">
-  <proof prover="0"><result status="valid" time="0.27" steps="1000"/></proof>
+  <proof prover="0"><result status="valid" time="0.31" steps="1000"/></proof>
   </goal>
   <goal name="WP_parameter memmove_ensures_default.8" expl="loop invariant preservation">
   <transf name="split_goal_wp" expanded="true">
    <goal name="WP_parameter memmove_ensures_default.8.1" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="212"/></proof>
+   <proof prover="0"><result status="valid" time="0.06" steps="212"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.2" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="212"/></proof>
+   <proof prover="0"><result status="valid" time="0.05" steps="212"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.3" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.22" steps="697"/></proof>
+   <proof prover="0"><result status="valid" time="0.27" steps="697"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.4" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.21" steps="614"/></proof>
+   <proof prover="0"><result status="valid" time="0.26" steps="614"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.5" expl="Function memmove, default behavior">
    <proof prover="0"><result status="valid" time="0.03" steps="220"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.6" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="220"/></proof>
+   <proof prover="0"><result status="valid" time="0.04" steps="220"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.7" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="220"/></proof>
+   <proof prover="0"><result status="valid" time="0.05" steps="220"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.8" expl="Function memmove, default behavior">
    <proof prover="0"><result status="valid" time="0.03" steps="220"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.9" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="228"/></proof>
+   <proof prover="0"><result status="valid" time="0.04" steps="228"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.10" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.04" steps="228"/></proof>
+   <proof prover="0"><result status="valid" time="0.05" steps="228"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.11" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="228"/></proof>
+   <proof prover="0"><result status="valid" time="0.04" steps="228"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.12" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="228"/></proof>
+   <proof prover="0"><result status="valid" time="0.04" steps="228"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.13" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.55" steps="1738"/></proof>
+   <proof prover="0"><result status="valid" time="0.66" steps="1738"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.14" expl="Function memmove, default behavior">
-   <proof prover="0"><result status="valid" time="0.11" steps="938"/></proof>
+   <proof prover="0"><result status="valid" time="0.13" steps="938"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.15" expl="Assigns clause">
-   <proof prover="1"><result status="valid" time="0.33"/></proof>
+   <proof prover="1"><result status="valid" time="0.42"/></proof>
    </goal>
    <goal name="WP_parameter memmove_ensures_default.8.16" expl="Assigns clause">
-   <proof prover="1"><result status="valid" time="0.35"/></proof>
+   <proof prover="1"><result status="valid" time="0.42"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="WP_parameter memmove_ensures_default.9" expl="Assertion in line 42">
-  <proof prover="0"><result status="valid" time="0.06" steps="405"/></proof>
+  <proof prover="0"><result status="valid" time="0.12" steps="405"/></proof>
   </goal>
   <goal name="WP_parameter memmove_ensures_default.10" expl="Assigns clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.02" steps="199"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="199"/></proof>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter memmove_ensures_diff_addr" expl="Function memmove, behavior diff_addr" expanded="true">
- <proof prover="0"><result status="valid" time="0.42" steps="2658"/></proof>
+ <proof prover="0"><result status="valid" time="0.50" steps="2658"/></proof>
  </goal>
  <goal name="WP_parameter memmove_ensures_same_addr" expl="Function memmove, behavior same_addr" expanded="true">
- <proof prover="1"><result status="valid" time="0.12"/></proof>
+ <proof prover="1"><result status="valid" time="0.15"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/memscan.av/whole_program/why3session.xml b/sessions/memscan.av/whole_program/why3session.xml
index f78cbc6..7539c80 100644
--- a/sessions/memscan.av/whole_program/why3session.xml
+++ b/sessions/memscan.av/whole_program/why3session.xml
@@ -781,7 +781,7 @@
 </theory>
 <theory name="Function_memscan_safety" sum="f96c3911a834a1861d72e89a47e96a9b" expanded="true">
  <goal name="WP_parameter memscan" expl="Function memscan, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.12"/></proof>
+ <proof prover="1"><result status="valid" time="0.19"/></proof>
  </goal>
 </theory>
 <theory name="Function_memscan_behaviors" sum="58cc45274894dc229b52e582b8ca6ab6" expanded="true">
@@ -791,27 +791,27 @@
   <proof prover="0"><result status="valid" time="0.01" steps="23"/></proof>
   </goal>
   <goal name="WP_parameter memscan_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.01" steps="21"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="21"/></proof>
   </goal>
   <goal name="WP_parameter memscan_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.04" steps="485"/></proof>
+  <proof prover="0"><result status="valid" time="0.08" steps="485"/></proof>
   </goal>
   <goal name="WP_parameter memscan_ensures_default.4" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.02" steps="157"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="157"/></proof>
   </goal>
   <goal name="WP_parameter memscan_ensures_default.5" expl="loop invariant preservation">
-  <proof prover="0"><result status="valid" time="0.12" steps="904"/></proof>
+  <proof prover="0"><result status="valid" time="0.17" steps="904"/></proof>
   </goal>
   <goal name="WP_parameter memscan_ensures_default.6" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.02" steps="145"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="145"/></proof>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter memscan_ensures_found" expl="Function memscan, behavior found" expanded="true">
- <proof prover="1"><result status="valid" time="0.13"/></proof>
+ <proof prover="1"><result status="valid" time="0.20"/></proof>
  </goal>
  <goal name="WP_parameter memscan_ensures_not_exists" expl="Function memscan, behavior not_exists" expanded="true">
- <proof prover="0"><result status="valid" time="0.05" steps="357"/></proof>
+ <proof prover="0"><result status="valid" time="0.06" steps="357"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/memset.av/whole_program/why3session.xml b/sessions/memset.av/whole_program/why3session.xml
index 2a80e64..bb3045e 100644
--- a/sessions/memset.av/whole_program/why3session.xml
+++ b/sessions/memset.av/whole_program/why3session.xml
@@ -773,17 +773,17 @@
 </theory>
 <theory name="Function_memset_safety" sum="0ef47a6cc4c49eeca2e5dc4c7a082016" expanded="true">
  <goal name="WP_parameter memset" expl="Function memset, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.17" steps="839"/></proof>
+ <proof prover="0"><result status="valid" time="0.19" steps="839"/></proof>
  </goal>
 </theory>
 <theory name="Function_memset_behaviors" sum="46ff356b7e520d90866a6870aa2eba7d" expanded="true">
  <goal name="WP_parameter memset_ensures_default" expl="Function memset, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter memset_ensures_default.1" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.42" steps="2069"/></proof>
+  <proof prover="0"><result status="valid" time="0.32" steps="1403"/></proof>
   </goal>
   <goal name="WP_parameter memset_ensures_default.2" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.17"/></proof>
+  <proof prover="1"><result status="valid" time="0.20"/></proof>
   </goal>
   <goal name="WP_parameter memset_ensures_default.3" expl="Assertion in line 17">
   <proof prover="0"><result status="valid" time="0.05" steps="309"/></proof>
diff --git a/sessions/skip_spaces.av/whole_program/why3session.xml b/sessions/skip_spaces.av/whole_program/why3session.xml
index d4de313..5709ef4 100644
--- a/sessions/skip_spaces.av/whole_program/why3session.xml
+++ b/sessions/skip_spaces.av/whole_program/why3session.xml
@@ -2,9 +2,114 @@
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
 "http://why3.lri.fr/why3session.dtd">
 <why3session shape_version="4">
-<prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
-<prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
+<prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="5" steplimit="0" memlimit="1000"/>
+<prover id="2" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
+<theory name="Function_skip_spaces_0_safety" sum="4d19d47795798a3abdd1ec862b615bbd" expanded="true">
+ <goal name="WP_parameter skip_spaces_0" expl="Function skip_spaces, safety" expanded="true">
+ <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.64" steps="2098"/></proof>
+ </goal>
+</theory>
+<theory name="Function_skip_spaces_0_behaviors" sum="76cb8c9b293ff4cba69b2701d9b5f75a" expanded="true">
+ <goal name="WP_parameter skip_spaces_ensures_default" expl="Function skip_spaces, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter skip_spaces_ensures_default.1" expl="loop invariant init" expanded="true">
+  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.36" steps="2561"/></proof>
+  </goal>
+  <goal name="WP_parameter skip_spaces_ensures_default.2" expl="loop invariant preservation" expanded="true">
+  <proof prover="2"><result status="valid" time="0.60"/></proof>
+  </goal>
+  <goal name="WP_parameter skip_spaces_ensures_default.3" expl="Postcondition (Ensures clause)" expanded="true">
+  <proof prover="2"><result status="valid" time="0.08"/></proof>
+  </goal>
+ </transf>
+ </goal>
+</theory>
+<theory name="Function_is_space_safety" sum="f8365cba280267b491c68399d0d82d9e" expanded="true">
+ <goal name="WP_parameter is_space" expl="Function is_space, safety" expanded="true">
+ <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.01" steps="103"/></proof>
+ </goal>
+</theory>
+<theory name="Function_is_space_behaviors" sum="589c9daeffcefe192d1c04a6cebff5a3" expanded="true">
+ <goal name="WP_parameter is_space_ensures_default" expl="Function is_space, default behavior" expanded="true">
+ <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.40" steps="3672"/></proof>
+ </goal>
+</theory>
+<theory name="Function_skip_spaces_defn_safety" sum="5c6e3f6186bad72b6b80371ecfac4fb4" expanded="true">
+ <goal name="WP_parameter skip_spaces_defn" expl="Function skip_spaces_defn, safety" expanded="true">
+ <proof prover="2"><result status="valid" time="0.52"/></proof>
+ </goal>
+</theory>
+<theory name="Function_skip_spaces_defn_behaviors" sum="dc03366b29e23ebde0ec5e3f8ec614c6" expanded="true">
+ <goal name="WP_parameter skip_spaces_defn_ensures_default" expl="Function skip_spaces_defn, default behavior" expanded="true">
+ <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.56" steps="3312"/></proof>
+ </goal>
+</theory>
+<theory name="Function_skip_spaces_range_safety" sum="89d4e7a534b442f3d18b8d18f3f72e36" expanded="true">
+ <goal name="WP_parameter skip_spaces_range" expl="Function skip_spaces_range, safety" expanded="true">
+ <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.72" steps="4848"/></proof>
+ </goal>
+</theory>
+<theory name="Function_skip_spaces_range_behaviors" sum="80f896f9dad0ce1fb81ab20fc28c2b1d" expanded="true">
+ <goal name="WP_parameter skip_spaces_range_ensures_default" expl="Function skip_spaces_range, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter skip_spaces_range_ensures_default.1" expl="Postcondition (Ensures clause)" expanded="true">
+  <transf name="split_goal_wp" expanded="true">
+   <goal name="WP_parameter skip_spaces_range_ensures_default.1.1" expl="Ensures clause">
+   <proof prover="0"><result status="valid" time="0.13" steps="592"/></proof>
+   </goal>
+   <goal name="WP_parameter skip_spaces_range_ensures_default.1.2" expl="Ensures clause">
+   <proof prover="0"><result status="valid" time="0.15" steps="641"/></proof>
+   </goal>
+   <goal name="WP_parameter skip_spaces_range_ensures_default.1.3" expl="Ensures clause">
+   <proof prover="0"><result status="valid" time="0.17" steps="1175"/></proof>
+   </goal>
+   <goal name="WP_parameter skip_spaces_range_ensures_default.1.4" expl="Ensures clause" expanded="true">
+   <transf name="remove_triggers" expanded="true">
+    <goal name="WP_parameter skip_spaces_range_ensures_default.1.4.1" expl="Ensures clause" expanded="true">
+    <transf name="introduce_premises" expanded="true">
+     <goal name="WP_parameter skip_spaces_range_ensures_default.1.4.1.1" expl="Ensures clause" expanded="true">
+     <transf name="inline_all" expanded="true">
+      <goal name="WP_parameter skip_spaces_range_ensures_default.1.4.1.1.1" expl="Ensures clause">
+      <proof prover="0"><result status="valid" time="0.74" steps="4835"/></proof>
+      </goal>
+     </transf>
+     </goal>
+    </transf>
+    </goal>
+   </transf>
+   </goal>
+  </transf>
+  </goal>
+  <goal name="WP_parameter skip_spaces_range_ensures_default.2" expl="Postcondition (Ensures clause)" expanded="true">
+  <transf name="split_goal_wp" expanded="true">
+   <goal name="WP_parameter skip_spaces_range_ensures_default.2.1" expl="Ensures clause">
+   <proof prover="0"><result status="valid" time="0.11" steps="522"/></proof>
+   </goal>
+   <goal name="WP_parameter skip_spaces_range_ensures_default.2.2" expl="Ensures clause">
+   <proof prover="0"><result status="valid" time="0.13" steps="623"/></proof>
+   </goal>
+   <goal name="WP_parameter skip_spaces_range_ensures_default.2.3" expl="Ensures clause">
+   <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
+   </goal>
+   <goal name="WP_parameter skip_spaces_range_ensures_default.2.4" expl="Ensures clause">
+   <proof prover="0"><result status="valid" time="0.13" steps="652"/></proof>
+   </goal>
+  </transf>
+  </goal>
+ </transf>
+ </goal>
+</theory>
+<theory name="Function_skipped_are_spaces_safety" sum="255241ecbcd903a17aa42be3668fb76e" expanded="true">
+ <goal name="WP_parameter skipped_are_spaces" expl="Function skipped_are_spaces, safety" expanded="true">
+ <proof prover="2"><result status="valid" time="0.14"/></proof>
+ </goal>
+</theory>
+<theory name="Function_skipped_are_spaces_behaviors" sum="7209f1644969796be4a0c19ba7b1265e" expanded="true">
+ <goal name="WP_parameter skipped_are_spaces_ensures_default" expl="Function skipped_are_spaces, default behavior" expanded="true">
+ <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.61" steps="5022"/></proof>
+ </goal>
+</theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
 <theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
@@ -991,79 +1096,5 @@
 </theory>
 <theory name="Function_skip_spaces_0_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_skip_spaces_0_safety" sum="4d19d47795798a3abdd1ec862b615bbd" expanded="true">
- <goal name="WP_parameter skip_spaces_0" expl="Function skip_spaces, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.45" steps="2045"/></proof>
- </goal>
-</theory>
-<theory name="Function_skip_spaces_0_behaviors" sum="8d90ffde71dd46ace3c07612c827adcf" expanded="true">
- <goal name="WP_parameter skip_spaces_ensures_default" expl="Function skip_spaces, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="1.31"/></proof>
- </goal>
-</theory>
-<theory name="Function_is_space_safety" sum="f8365cba280267b491c68399d0d82d9e" expanded="true">
- <goal name="WP_parameter is_space" expl="Function is_space, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.01" steps="103"/></proof>
- </goal>
-</theory>
-<theory name="Function_is_space_behaviors" sum="589c9daeffcefe192d1c04a6cebff5a3" expanded="true">
- <goal name="WP_parameter is_space_ensures_default" expl="Function is_space, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.26" steps="3672"/></proof>
- </goal>
-</theory>
-<theory name="Function_skip_spaces_defn_safety" sum="5c6e3f6186bad72b6b80371ecfac4fb4" expanded="true">
- <goal name="WP_parameter skip_spaces_defn" expl="Function skip_spaces_defn, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.34"/></proof>
- </goal>
-</theory>
-<theory name="Function_skip_spaces_defn_behaviors" sum="dc03366b29e23ebde0ec5e3f8ec614c6" expanded="true">
- <goal name="WP_parameter skip_spaces_defn_ensures_default" expl="Function skip_spaces_defn, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.44" steps="3312"/></proof>
- </goal>
-</theory>
-<theory name="Function_skip_spaces_range_safety" sum="89d4e7a534b442f3d18b8d18f3f72e36" expanded="true">
- <goal name="WP_parameter skip_spaces_range" expl="Function skip_spaces_range, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.46" steps="4848"/></proof>
- </goal>
-</theory>
-<theory name="Function_skip_spaces_range_behaviors" sum="fb82d8202d80c59da5e4eed6ef52357b" expanded="true">
- <goal name="WP_parameter skip_spaces_range_ensures_default" expl="Function skip_spaces_range, default behavior" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter skip_spaces_range_ensures_default.1" expl="Postcondition (Ensures clause)">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter skip_spaces_range_ensures_default.1.1" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.11" steps="592"/></proof>
-   </goal>
-   <goal name="WP_parameter skip_spaces_range_ensures_default.1.2" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.11" steps="641"/></proof>
-   </goal>
-   <goal name="WP_parameter skip_spaces_range_ensures_default.1.3" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.15" steps="1175"/></proof>
-   </goal>
-   <goal name="WP_parameter skip_spaces_range_ensures_default.1.4" expl="Ensures clause">
-   <transf name="remove_triggers" expanded="true">
-    <goal name="WP_parameter skip_spaces_range_ensures_default.1.4.1" expl="Ensures clause">
-    <proof prover="0"><result status="valid" time="1.89" steps="8750"/></proof>
-    </goal>
-   </transf>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter skip_spaces_range_ensures_default.2" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.14" steps="1284"/></proof>
-  </goal>
- </transf>
- </goal>
-</theory>
-<theory name="Function_skipped_are_spaces_safety" sum="255241ecbcd903a17aa42be3668fb76e" expanded="true">
- <goal name="WP_parameter skipped_are_spaces" expl="Function skipped_are_spaces, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.11"/></proof>
- </goal>
-</theory>
-<theory name="Function_skipped_are_spaces_behaviors" sum="7209f1644969796be4a0c19ba7b1265e" expanded="true">
- <goal name="WP_parameter skipped_are_spaces_ensures_default" expl="Function skipped_are_spaces, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.41" steps="4200"/></proof>
- </goal>
-</theory>
 </file>
 </why3session>
diff --git a/sessions/stpcpy.av/whole_program/why3session.xml b/sessions/stpcpy.av/whole_program/why3session.xml
index e074aed..3d40415 100644
--- a/sessions/stpcpy.av/whole_program/why3session.xml
+++ b/sessions/stpcpy.av/whole_program/why3session.xml
@@ -2,22 +2,23 @@
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
 "http://why3.lri.fr/why3session.dtd">
 <why3session shape_version="4">
-<prover id="0" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
-<prover id="2" name="Alt-Ergo" version="2.3.2" timelimit="2" steplimit="0" memlimit="2000"/>
-<file name="../whole_program.mlw">
-<theory name="Function_stpcpy_safety" sum="9b977ba9ee643141c80e10992ff9d1f0">
+<prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
+<prover id="2" name="Alt-Ergo" version="2.3.3" timelimit="5" steplimit="0" memlimit="1000"/>
+<prover id="3" name="CVC4" version="1.7" timelimit="5" steplimit="0" memlimit="1000"/>
+<file name="../whole_program.mlw" expanded="true">
+<theory name="Function_stpcpy_safety" sum="9b977ba9ee643141c80e10992ff9d1f0" expanded="true">
  <goal name="WP_parameter stpcpy" expl="Function stpcpy, safety">
- <proof prover="0"><result status="valid" time="0.11"/></proof>
+ <proof prover="1"><result status="valid" time="0.13"/></proof>
  </goal>
 </theory>
-<theory name="Function_stpcpy_behaviors" sum="9d6e061c962eaf7100b74612fcf9a7aa">
- <goal name="WP_parameter stpcpy_ensures_default" expl="Function stpcpy, default behavior">
- <transf name="split_goal_wp">
-  <goal name="WP_parameter stpcpy_ensures_default.1" expl="Assertion in line 16">
+<theory name="Function_stpcpy_behaviors" sum="6d6138566ae34eb8ad813747e36425ed" expanded="true">
+ <goal name="WP_parameter stpcpy_ensures_default" expl="Function stpcpy, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter stpcpy_ensures_default.1" expl="Assertion in line 7">
   <proof prover="2"><result status="valid" time="0.01" steps="16"/></proof>
   </goal>
   <goal name="WP_parameter stpcpy_ensures_default.2" expl="loop invariant init">
-  <proof prover="2"><result status="valid" time="0.18" steps="948"/></proof>
+  <proof prover="2"><result status="valid" time="0.17" steps="948"/></proof>
   </goal>
   <goal name="WP_parameter stpcpy_ensures_default.3" expl="loop invariant preservation">
   <transf name="split_goal_wp">
@@ -31,7 +32,7 @@
    <proof prover="2"><result status="valid" time="0.02" steps="70"/></proof>
    </goal>
    <goal name="WP_parameter stpcpy_ensures_default.3.4" expl="Function stpcpy, default behavior">
-   <proof prover="2"><result status="valid" time="0.99" steps="1482"/></proof>
+   <proof prover="2"><result status="valid" time="0.93" steps="1482"/></proof>
    </goal>
    <goal name="WP_parameter stpcpy_ensures_default.3.5" expl="Function stpcpy, default behavior">
    <proof prover="2"><result status="valid" time="0.02" steps="78"/></proof>
@@ -58,827 +59,843 @@
    <proof prover="2"><result status="valid" time="0.10" steps="698"/></proof>
    </goal>
    <goal name="WP_parameter stpcpy_ensures_default.3.13" expl="Assigns clause">
-   <proof prover="0"><result status="valid" time="0.13"/></proof>
+   <proof prover="3"><result status="valid" time="0.14" steps="34195"/></proof>
    </goal>
    <goal name="WP_parameter stpcpy_ensures_default.3.14" expl="Assigns clause">
-   <proof prover="0"><result status="valid" time="0.12"/></proof>
+   <proof prover="3"><result status="valid" time="0.14" steps="34175"/></proof>
    </goal>
   </transf>
   </goal>
-  <goal name="WP_parameter stpcpy_ensures_default.4" expl="Assertion in line 30">
-  <proof prover="2"><result status="valid" time="0.24" steps="1225"/></proof>
+  <goal name="WP_parameter stpcpy_ensures_default.4" expl="Assertion in line 21">
+  <proof prover="2"><result status="valid" time="0.26" steps="1225"/></proof>
   </goal>
-  <goal name="WP_parameter stpcpy_ensures_default.5" expl="Assertion in line 31">
-  <proof prover="2"><result status="valid" time="0.14" steps="482"/></proof>
+  <goal name="WP_parameter stpcpy_ensures_default.5" expl="Assertion in line 22">
+  <proof prover="2"><result status="valid" time="0.17" steps="482"/></proof>
   </goal>
-  <goal name="WP_parameter stpcpy_ensures_default.6" expl="Assertion in line 32">
-  <proof prover="2"><result status="valid" time="0.15" steps="575"/></proof>
+  <goal name="WP_parameter stpcpy_ensures_default.6" expl="Assertion in line 23">
+  <proof prover="2"><result status="valid" time="0.19" steps="575"/></proof>
   </goal>
   <goal name="WP_parameter stpcpy_ensures_default.7" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.34"/></proof>
+  <transf name="split_goal_wp">
+   <goal name="WP_parameter stpcpy_ensures_default.7.1" expl="Assigns clause">
+   <proof prover="3"><result status="valid" time="0.16" steps="40467"/></proof>
+   </goal>
+   <goal name="WP_parameter stpcpy_ensures_default.7.2" expl="Ensures clause">
+   <proof prover="2"><result status="valid" time="0.61" steps="1889"/></proof>
+   </goal>
+   <goal name="WP_parameter stpcpy_ensures_default.7.3" expl="Ensures clause">
+   <proof prover="2"><result status="valid" time="0.01" steps="79"/></proof>
+   </goal>
+   <goal name="WP_parameter stpcpy_ensures_default.7.4" expl="Ensures clause">
+   <proof prover="2"><result status="valid" time="0.22" steps="795"/></proof>
+   </goal>
+   <goal name="WP_parameter stpcpy_ensures_default.7.5" expl="Ensures clause">
+   <proof prover="2"><result status="valid" time="0.85" steps="2056"/></proof>
+   </goal>
+  </transf>
   </goal>
  </transf>
  </goal>
 </theory>
-<theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int32_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int32_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int64_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int64_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int64_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int64_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int64_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int64_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int64_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int64_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int8_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int8_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int8_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int8_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int8_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int8_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int8_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int8_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int8_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int8_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int8_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int8_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint16_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint16_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint16_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint16_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint16_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint16_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint16_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint16_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint16_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint16_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint16_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint16_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint16_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint16_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint16_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint16_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint32_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint32_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint32_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint32_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint32_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint32_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint32_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint32_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint32_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint32_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint32_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint32_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint32_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint32_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint32_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint32_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint32_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint32_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint64_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint64_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint64_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint64_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint64_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint64_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint64_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint64_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint64_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint64_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint64_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint64_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint64_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint64_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint64_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint64_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint64_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint64_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint64_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint64_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint64_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint64_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint64_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint64_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint8_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint8_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint8_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint8_of_Bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint8_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint8_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint8_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint8_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint8_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint8_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint8_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint8_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint8_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint8_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint8_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint8_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint8_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint8_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint8_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint8_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint8_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint8_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint8_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint8_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint8_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint8_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint8_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint8_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int16_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int16_of_Int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int16_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int16_of_Bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int16_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int16_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int16_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int16_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int32_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int32_of_Int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int32_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int32_of_Bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int16_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int16_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int16_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int16_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int32_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int32_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int32_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int32_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int64_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int64_of_Int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int64_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int64_of_Bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int16_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int16_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int16_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int16_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int32_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int32_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int32_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int32_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int64_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int64_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int64_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int64_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int8_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int8_of_Uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int8_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int8_of_Bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int16_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int16_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int16_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int16_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int32_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int32_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int32_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int32_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int64_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int64_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int64_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int64_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int8_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int8_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int8_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int8_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint16_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint16_of_Uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint16_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint16_of_Bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int16_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int16_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int16_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int16_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int32_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int32_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int32_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int32_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int64_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int64_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int64_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int64_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int8_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int8_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int8_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int8_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint16_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint16_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint16_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint16_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint32_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint32_of_Uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint32_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint32_of_Bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int16_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int16_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int16_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int16_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int32_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int32_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int32_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int32_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int64_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int64_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int64_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int64_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Int8_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Int8_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_int8_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_int8_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint16_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint16_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint16_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint16_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint32_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint32_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint32_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint32_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Uint64_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Uint64_of_Uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Bit_uint64_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Bit_uint64_of_Bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Globals_simple" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Globals_simple" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Root_voidP" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Root_voidP" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Root_voidP_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Root_voidP_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Root_voidP_unsafe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Root_voidP_unsafe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Axiomatic_Strlen" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Axiomatic_Strlen" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Axiomatic_LF__Axiomatic__valid_str_len" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Axiomatic_LF__Axiomatic__valid_str_len" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Axiomatic_LF__Axiomatic__valid_str_shift" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Axiomatic_LF__Axiomatic__valid_str_shift" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int32_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int32_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Exceptions" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Exceptions" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int32_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int32_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Logic_type_padding" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Logic_type_padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Struct_voidP" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Struct_voidP" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Struct_charP" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Struct_charP" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Struct_charP_unsafe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Struct_charP_unsafe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Struct_charP_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Struct_charP_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Struct_voidP_unsafe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Struct_voidP_unsafe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Struct_voidP_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Struct_voidP_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint64_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint64_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint64_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint64_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint64_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint64_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint64_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint64_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint32_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint32_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint32_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint32_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint32_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint32_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint32_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint32_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint16_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint16_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint16_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint16_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint16_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint16_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint16_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint16_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int8_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int8_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int8_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int8_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int8_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int8_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int8_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int8_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int64_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int64_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int64_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int64_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int64_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int64_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int64_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int64_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int32_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int32_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int32_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int32_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int32_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int32_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int32_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int32_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int16_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int16_of_Safe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int16_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int16_of_Unsafe_bit_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int16_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int16_of_Safe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int16_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int16_of_Unsafe_uint8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint32_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint32_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint32_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint32_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint32_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint32_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint32_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint32_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint16_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint16_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint16_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint16_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint16_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint16_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint16_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint16_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int8_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int8_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int8_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int8_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int8_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int8_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int8_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int8_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int64_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int64_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int64_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int64_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int64_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int64_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int64_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int64_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int32_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int32_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int32_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int32_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int32_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int32_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int32_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int32_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int16_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int16_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int16_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int16_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int16_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int16_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int16_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int16_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint16_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint16_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint16_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint16_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint16_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint16_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint16_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint16_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int8_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int8_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int8_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int8_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int8_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int8_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int8_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int8_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int64_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int64_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int64_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int64_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int64_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int64_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int64_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int64_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int32_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int32_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int32_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int32_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int32_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int32_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int32_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int32_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int16_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int16_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int16_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int16_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int16_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int16_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int16_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int16_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int8_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int8_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int8_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int8_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int8_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int8_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int8_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int8_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int64_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int64_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int64_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int64_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int64_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int64_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int64_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int64_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int32_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int32_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int32_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int32_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int32_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int32_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int32_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int32_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int16_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int16_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int16_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int16_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int16_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int16_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int16_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int16_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int64_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int64_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int64_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int64_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int64_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int64_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int64_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int64_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int32_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int32_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int32_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int32_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int16_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int16_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int16_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int16_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int16_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int16_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int16_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int16_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int32_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int32_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int32_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int32_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int32_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int32_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int32_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int32_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int16_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int16_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int16_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int16_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int16_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int16_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int16_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int16_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int16_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int16_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int16_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int16_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int16_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int16_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int16_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int16_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint8_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint8_of_Safe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint8_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint8_of_Unsafe_bit_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint8_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint8_of_Safe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint8_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint8_of_Unsafe_uint64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint8_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint8_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint8_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint8_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint8_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint8_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint8_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint8_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint8_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint8_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint8_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint8_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint8_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint8_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint8_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint8_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint8_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint8_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint8_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint8_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint8_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint8_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint8_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint8_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint8_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint8_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint8_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint8_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint8_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint8_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint8_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint8_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint8_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint8_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint8_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint8_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint8_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint8_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint8_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint8_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint8_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint8_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint8_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint8_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint8_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint8_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint8_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint8_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint64_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint64_of_Safe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint64_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint64_of_Unsafe_bit_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint64_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint64_of_Safe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint64_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint64_of_Unsafe_uint32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint64_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint64_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint64_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint64_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint64_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint64_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint64_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint64_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint64_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint64_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint64_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint64_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint64_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint64_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint64_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint64_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint64_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint64_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint64_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint64_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint64_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint64_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint64_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint64_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint64_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint64_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint64_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint64_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint64_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint64_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint64_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint64_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint64_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint64_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint64_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint64_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint64_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint64_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint64_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint64_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint32_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint32_of_Safe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint32_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint32_of_Unsafe_bit_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint32_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint32_of_Safe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint32_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint32_of_Unsafe_uint16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint32_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint32_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint32_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint32_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint32_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint32_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint32_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint32_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint32_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint32_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint32_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint32_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint32_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint32_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint32_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint32_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint32_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint32_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint32_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint32_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint32_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint32_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint32_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint32_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint32_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint32_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint32_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint32_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint32_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint32_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint32_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint32_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint16_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint16_of_Safe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint16_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint16_of_Unsafe_bit_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint16_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint16_of_Safe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint16_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint16_of_Unsafe_int8" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint16_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint16_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint16_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint16_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint16_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint16_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint16_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint16_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint16_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint16_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint16_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint16_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint16_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint16_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint16_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint16_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_uint16_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_uint16_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_uint16_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_uint16_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_uint16_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_uint16_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_uint16_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_uint16_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int8_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int8_of_Safe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int8_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int8_of_Unsafe_bit_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int8_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int8_of_Safe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int8_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int8_of_Unsafe_int64" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int8_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int8_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int8_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int8_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int8_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int8_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int8_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int8_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int8_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int8_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int8_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int8_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int8_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int8_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int8_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int8_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int64_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int64_of_Safe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int64_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int64_of_Unsafe_bit_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int64_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int64_of_Safe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int64_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int64_of_Unsafe_int32" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int64_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int64_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int64_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int64_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int64_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int64_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int64_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int64_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_bit_int32_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_bit_int32_of_Safe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_bit_int32_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_bit_int32_of_Unsafe_bit_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Safe_int32_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Safe_int32_of_Safe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Unsafe_int32_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Unsafe_int32_of_Unsafe_int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_elim_valid_str" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_elim_valid_str" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_elim_valid_str_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_elim_valid_str_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_elim_valid_str_len" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_elim_valid_str_len" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_elim_valid_str_len_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_elim_valid_str_len_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_valid_str_len" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_valid_str_len" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_valid_str_len_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_valid_str_len_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_intro_valid_str_len" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_intro_valid_str_len" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_intro_valid_str_len_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_intro_valid_str_len_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_valid_str_shift" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_valid_str_shift" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_valid_str_shift_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_valid_str_shift_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_elim_strlen" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_elim_strlen" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_elim_strlen_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_elim_strlen_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_strlen_0" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_strlen_0" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_strlen_0_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_strlen_0_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_stpcpy" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_stpcpy" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_stpcpy_safe" sum="d41d8cd98f00b204e9800998ecf8427e">
+<theory name="Function_stpcpy_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
 </file>
 </why3session>
diff --git a/sessions/strcasecmp.av/whole_program/why3session.xml b/sessions/strcasecmp.av/whole_program/why3session.xml
index bae5ef5..bebc5e0 100644
--- a/sessions/strcasecmp.av/whole_program/why3session.xml
+++ b/sessions/strcasecmp.av/whole_program/why3session.xml
@@ -3,8 +3,56 @@
 "http://why3.lri.fr/why3session.dtd">
 <why3session shape_version="4">
 <prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
-<prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
+<prover id="2" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
+<theory name="Function_strcasecmp_safety" sum="3e76612b12d089861fde77793d22c02c" expanded="true">
+ <goal name="WP_parameter strcasecmp" expl="Function strcasecmp, safety" expanded="true">
+ <proof prover="2"><result status="valid" time="0.39"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strcasecmp_behaviors" sum="3bc4847547a542a5389b723474ef5f91" expanded="true">
+ <goal name="WP_parameter strcasecmp_ensures_default" expl="Function strcasecmp, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter strcasecmp_ensures_default.1" expl="Behavior disjointness check">
+  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
+  </goal>
+  <goal name="WP_parameter strcasecmp_ensures_default.2" expl="Behavior completeness check">
+  <proof prover="0"><result status="valid" time="0.02" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter strcasecmp_ensures_default.3" expl="loop invariant init">
+  <proof prover="0"><result status="valid" time="0.73" steps="8812"/></proof>
+  </goal>
+  <goal name="WP_parameter strcasecmp_ensures_default.4" expl="loop invariant preservation">
+  <proof prover="0"><result status="valid" time="0.05" steps="312"/></proof>
+  </goal>
+  <goal name="WP_parameter strcasecmp_ensures_default.5" expl="Assertion in line 23">
+  <proof prover="0"><result status="valid" time="0.03" steps="132"/></proof>
+  </goal>
+  <goal name="WP_parameter strcasecmp_ensures_default.6" expl="Assertion in line 24">
+  <proof prover="0"><result status="valid" time="0.02" steps="124"/></proof>
+  </goal>
+  <goal name="WP_parameter strcasecmp_ensures_default.7" expl="Assertion in line 23">
+  <proof prover="0"><result status="valid" time="1.57" steps="11529"/></proof>
+  </goal>
+  <goal name="WP_parameter strcasecmp_ensures_default.8" expl="Assertion in line 24">
+  <proof prover="0"><result status="valid" time="1.57" steps="11529"/></proof>
+  </goal>
+ </transf>
+ </goal>
+ <goal name="WP_parameter strcasecmp_ensures_equal" expl="Function strcasecmp, behavior equal">
+ <proof prover="2"><result status="valid" time="0.37"/></proof>
+ </goal>
+ <goal name="WP_parameter strcasecmp_ensures_not_equal" expl="Function strcasecmp, behavior not_equal">
+ <transf name="split_goal_wp">
+  <goal name="WP_parameter strcasecmp_ensures_not_equal.1" expl="Postcondition (Ensures clause)">
+  <proof prover="2"><result status="valid" time="0.48"/></proof>
+  </goal>
+  <goal name="WP_parameter strcasecmp_ensures_not_equal.2" expl="Postcondition (Ensures clause)">
+  <proof prover="2"><result status="valid" time="0.47"/></proof>
+  </goal>
+ </transf>
+ </goal>
+</theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
 <theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
@@ -967,90 +1015,5 @@
 </theory>
 <theory name="Function_strcasecmp_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_strcasecmp_safety" sum="3e76612b12d089861fde77793d22c02c" expanded="true">
- <goal name="WP_parameter strcasecmp" expl="Function strcasecmp, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.26"/></proof>
- </goal>
-</theory>
-<theory name="Function_strcasecmp_behaviors" sum="3047fb7260f480c5f1af1c9db2331577" expanded="true">
- <goal name="WP_parameter strcasecmp_ensures_default" expl="Function strcasecmp, default behavior" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strcasecmp_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
-  </goal>
-  <goal name="WP_parameter strcasecmp_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="72"/></proof>
-  </goal>
-  <goal name="WP_parameter strcasecmp_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.69" steps="8812"/></proof>
-  </goal>
-  <goal name="WP_parameter strcasecmp_ensures_default.4" expl="loop invariant preservation">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter strcasecmp_ensures_default.4.1" expl="Function strcasecmp, default behavior">
-   <proof prover="1"><result status="valid" time="0.25"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.2" expl="Function strcasecmp, default behavior">
-   <proof prover="1"><result status="valid" time="0.26"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.3" expl="Function strcasecmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="132"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.4" expl="Function strcasecmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="132"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.5" expl="Function strcasecmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="132"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.6" expl="Function strcasecmp, default behavior">
-   <proof prover="1"><result status="valid" time="0.33"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.7" expl="Function strcasecmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="140"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.8" expl="Function strcasecmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="140"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.9" expl="Function strcasecmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="140"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.10" expl="Function strcasecmp, default behavior">
-   <proof prover="1"><result status="valid" time="0.36"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.11" expl="Function strcasecmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.04" steps="148"/></proof>
-   </goal>
-   <goal name="WP_parameter strcasecmp_ensures_default.4.12" expl="Function strcasecmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.04" steps="154"/></proof>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter strcasecmp_ensures_default.5" expl="Assertion in line 23">
-  <proof prover="0"><result status="valid" time="0.03" steps="312"/></proof>
-  </goal>
-  <goal name="WP_parameter strcasecmp_ensures_default.6" expl="Assertion in line 24">
-  <proof prover="0"><result status="valid" time="0.02" steps="132"/></proof>
-  </goal>
-  <goal name="WP_parameter strcasecmp_ensures_default.7" expl="Assertion in line 23">
-  <proof prover="0"><result status="valid" time="0.02" steps="124"/></proof>
-  </goal>
-  <goal name="WP_parameter strcasecmp_ensures_default.8" expl="Assertion in line 24">
-  <proof prover="0"><result status="valid" time="1.43" steps="11509"/></proof>
-  </goal>
- </transf>
- </goal>
- <goal name="WP_parameter strcasecmp_ensures_equal" expl="Function strcasecmp, behavior equal" expanded="true">
- <proof prover="1"><result status="valid" time="0.23"/></proof>
- </goal>
- <goal name="WP_parameter strcasecmp_ensures_not_equal" expl="Function strcasecmp, behavior not_equal" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strcasecmp_ensures_not_equal.1" expl="Postcondition (Ensures clause)">
-  <proof prover="0"><result status="valid" time="0.75" steps="4848"/></proof>
-  </goal>
-  <goal name="WP_parameter strcasecmp_ensures_not_equal.2" expl="Postcondition (Ensures clause)">
-  <proof prover="1"><result status="valid" time="0.34"/></proof>
-  </goal>
- </transf>
- </goal>
-</theory>
 </file>
 </why3session>
diff --git a/sessions/strcat.av/whole_program/why3session.xml b/sessions/strcat.av/whole_program/why3session.xml
index 05a4a20..990f206 100644
--- a/sessions/strcat.av/whole_program/why3session.xml
+++ b/sessions/strcat.av/whole_program/why3session.xml
@@ -808,60 +808,60 @@
 </theory>
 <theory name="Function_strcat_safety" sum="bc7ebda18543f48bac7038a196d14637" expanded="true">
  <goal name="WP_parameter strcat" expl="Function strcat, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.27"/></proof>
+ <proof prover="1"><result status="valid" time="0.36"/></proof>
  </goal>
 </theory>
 <theory name="Function_strcat_behaviors" sum="cecbf03ed73b7d44c409b58324a7434f" expanded="true">
  <goal name="WP_parameter strcat_ensures_default" expl="Function strcat, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter strcat_ensures_default.1" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.06" steps="216"/></proof>
+  <proof prover="0"><result status="valid" time="0.07" steps="216"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.2" expl="loop invariant preservation">
-  <proof prover="0"><result status="valid" time="0.38" steps="2162"/></proof>
+  <proof prover="0"><result status="valid" time="0.44" steps="2157"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.3" expl="Assertion in line 16">
   <proof prover="0"><result status="valid" time="0.01" steps="43"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.4" expl="Assertion in line 17">
-  <proof prover="0"><result status="valid" time="0.45" steps="1292"/></proof>
+  <proof prover="0"><result status="valid" time="0.52" steps="1292"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.5" expl="Assertion in line 18">
   <proof prover="0"><result status="valid" time="0.01" steps="42"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.6" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.62" steps="2082"/></proof>
+  <proof prover="0"><result status="valid" time="0.70" steps="2082"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.7" expl="loop invariant preservation">
-  <proof prover="2"><result status="valid" time="0.51" steps="115150"/></proof>
+  <proof prover="2"><result status="valid" time="0.89" steps="115150"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.8" expl="Assertion in line 34">
-  <proof prover="1"><result status="valid" time="0.85"/></proof>
+  <proof prover="1"><result status="valid" time="1.38"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.9" expl="Assertion in line 35">
-  <proof prover="0"><result status="valid" time="0.59" steps="2149"/></proof>
+  <proof prover="0"><result status="valid" time="0.69" steps="2149"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.10" expl="Assertion in line 36">
-  <proof prover="0"><result status="valid" time="0.26" steps="891"/></proof>
+  <proof prover="0"><result status="valid" time="0.30" steps="891"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.11" expl="Assertion in line 37">
-  <proof prover="0"><result status="valid" time="0.29" steps="920"/></proof>
+  <proof prover="0"><result status="valid" time="0.35" steps="920"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.12" expl="Assertion in line 38">
-  <proof prover="0"><result status="valid" time="0.67" steps="2433"/></proof>
+  <proof prover="0"><result status="valid" time="0.81" steps="2433"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.13" expl="Assertion in line 39">
-  <proof prover="1"><result status="valid" time="0.19"/></proof>
+  <proof prover="1"><result status="valid" time="0.31"/></proof>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.14" expl="Assertion in line 43">
   <transf name="remove_triggers" expanded="true">
    <goal name="WP_parameter strcat_ensures_default.14.1" expl="Assertion in line 43">
-   <proof prover="1"><result status="valid" time="0.57"/></proof>
+   <proof prover="1"><result status="valid" time="0.84"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="WP_parameter strcat_ensures_default.15" expl="Postcondition">
-  <proof prover="1"><result status="valid" time="0.26"/></proof>
+  <proof prover="1"><result status="valid" time="0.36"/></proof>
   </goal>
  </transf>
  </goal>
diff --git a/sessions/strchr.av/whole_program/why3session.xml b/sessions/strchr.av/whole_program/why3session.xml
index 25f9725..4460f62 100644
--- a/sessions/strchr.av/whole_program/why3session.xml
+++ b/sessions/strchr.av/whole_program/why3session.xml
@@ -839,40 +839,40 @@
 </theory>
 <theory name="Function_strchr_0_safety" sum="d1e9a70a8e43bf049511303869dc4874" expanded="true">
  <goal name="WP_parameter strchr_0" expl="Function strchr, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.27" steps="1254"/></proof>
+ <proof prover="0"><result status="valid" time="0.31" steps="1254"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_0_behaviors" sum="5b3da881c924fadeadae9c5bc7caea16" expanded="true">
  <goal name="WP_parameter strchr_ensures_default" expl="Function strchr, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter strchr_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.03" steps="155"/></proof>
+  <proof prover="0"><result status="valid" time="0.05" steps="155"/></proof>
   </goal>
   <goal name="WP_parameter strchr_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="153"/></proof>
+  <proof prover="0"><result status="valid" time="0.06" steps="153"/></proof>
   </goal>
   <goal name="WP_parameter strchr_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.07" steps="483"/></proof>
+  <proof prover="0"><result status="valid" time="0.16" steps="483"/></proof>
   </goal>
   <goal name="WP_parameter strchr_ensures_default.4" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="303"/></proof>
+  <proof prover="0"><result status="valid" time="0.09" steps="303"/></proof>
   </goal>
   <goal name="WP_parameter strchr_ensures_default.5" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.20"/></proof>
+  <proof prover="1"><result status="valid" time="0.24"/></proof>
   </goal>
   <goal name="WP_parameter strchr_ensures_default.6" expl="Assertion in line 16">
-  <proof prover="0"><result status="valid" time="0.58" steps="1060"/></proof>
+  <proof prover="0"><result status="valid" time="0.84" steps="1060"/></proof>
   </goal>
   <goal name="WP_parameter strchr_ensures_default.7" expl="Assertion in line 17">
-  <proof prover="0"><result status="valid" time="0.03" steps="204"/></proof>
+  <proof prover="0"><result status="valid" time="0.06" steps="204"/></proof>
   </goal>
   <goal name="WP_parameter strchr_ensures_default.8" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="174"/></proof>
+  <proof prover="0"><result status="valid" time="0.05" steps="174"/></proof>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter strchr_ensures_exists" expl="Function strchr, behavior exists" expanded="true">
- <proof prover="0"><result status="valid" time="0.29" steps="1851"/></proof>
+ <proof prover="0"><result status="valid" time="0.37" steps="1853"/></proof>
  </goal>
  <goal name="WP_parameter strchr_ensures_not_exists" expl="Function strchr, behavior not_exists" expanded="true">
  <proof prover="0"><result status="valid" time="0.03" steps="170"/></proof>
@@ -880,52 +880,52 @@
 </theory>
 <theory name="Function_strchr_mem_safety" sum="77351831fec9846c7a3b6485f6f60ac3" expanded="true">
  <goal name="WP_parameter strchr_mem" expl="Function strchr_mem, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.16"/></proof>
+ <proof prover="1"><result status="valid" time="0.21"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_mem_behaviors" sum="6af77e13dd8fa6118fe65f7a63b6d4f8" expanded="true">
  <goal name="WP_parameter strchr_mem_ensures_default" expl="Function strchr_mem, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="1.56" steps="4944"/></proof>
+ <proof prover="0"><result status="valid" time="1.91" steps="4894"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_res_safety" sum="7fc01d2f1cd7cc95c842473074ce9e9b" expanded="true">
  <goal name="WP_parameter strchr_res" expl="Function strchr_res, safety" expanded="true">
- <proof prover="0"><result status="valid" time="1.16" steps="1899"/></proof>
+ <proof prover="0"><result status="valid" time="1.37" steps="1899"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_res_behaviors" sum="a042d76dae0de0ae6c0a6a716d0f5908" expanded="true">
  <goal name="WP_parameter strchr_res_ensures_default" expl="Function strchr_res, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.10" steps="983"/></proof>
+ <proof prover="0"><result status="valid" time="0.11" steps="983"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_defn_safety" sum="1f1f46d40450a17ad04620a6c2f9dde2" expanded="true">
  <goal name="WP_parameter strchr_defn" expl="Function strchr_defn, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.08"/></proof>
+ <proof prover="1"><result status="valid" time="0.10"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_defn_behaviors" sum="16528efbcc1cd790ac14d53d4f89fe53" expanded="true">
  <goal name="WP_parameter strchr_defn_ensures_default" expl="Function strchr_defn, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="0.15"/></proof>
+ <proof prover="1"><result status="valid" time="0.20"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_not_null_safety" sum="68e86c2ee9d192e1b9a14bbadda79fcd" expanded="true">
  <goal name="WP_parameter strchr_not_null" expl="Function strchr_not_null, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.76"/></proof>
+ <proof prover="1"><result status="valid" time="1.02"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_not_null_behaviors" sum="c9ddf277daee28f2dfa86797ba4b9d12" expanded="true">
  <goal name="WP_parameter strchr_not_null_ensures_default" expl="Function strchr_not_null, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="0.13"/></proof>
+ <proof prover="1"><result status="valid" time="0.17"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_skipped_safety" sum="188a2766fb42520a2f49d284617d657e" expanded="true">
  <goal name="WP_parameter strchr_skipped" expl="Function strchr_skipped, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.09"/></proof>
+ <proof prover="1"><result status="valid" time="0.12"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchr_skipped_behaviors" sum="b2beea5deaf866abc85f947c72664ad0" expanded="true">
  <goal name="WP_parameter strchr_skipped_ensures_default" expl="Function strchr_skipped, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="0.11"/></proof>
+ <proof prover="1"><result status="valid" time="0.16"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/strchrnul.av/whole_program/why3session.xml b/sessions/strchrnul.av/whole_program/why3session.xml
index 3a987bf..6940e2b 100644
--- a/sessions/strchrnul.av/whole_program/why3session.xml
+++ b/sessions/strchrnul.av/whole_program/why3session.xml
@@ -839,38 +839,38 @@
 </theory>
 <theory name="Function_strchrnul_0_safety" sum="1c830b0b047a5992a1f72d788badfe64" expanded="true">
  <goal name="WP_parameter strchrnul_0" expl="Function strchrnul, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.27" steps="1427"/></proof>
+ <proof prover="0"><result status="valid" time="0.38" steps="1427"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_0_behaviors" sum="cc8c60d1044247049019cb20f8e60279" expanded="true">
  <goal name="WP_parameter strchrnul_ensures_default" expl="Function strchrnul, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter strchrnul_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="151"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="151"/></proof>
   </goal>
   <goal name="WP_parameter strchrnul_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="149"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="149"/></proof>
   </goal>
   <goal name="WP_parameter strchrnul_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.08" steps="558"/></proof>
+  <proof prover="0"><result status="valid" time="0.12" steps="558"/></proof>
   </goal>
   <goal name="WP_parameter strchrnul_ensures_default.4" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.10"/></proof>
+  <proof prover="1"><result status="valid" time="0.14"/></proof>
   </goal>
   <goal name="WP_parameter strchrnul_ensures_default.5" expl="Assertion in line 15">
   <proof prover="0"><result status="valid" time="0.03" steps="171"/></proof>
   </goal>
   <goal name="WP_parameter strchrnul_ensures_default.6" expl="Assertion in line 16">
-  <proof prover="0"><result status="valid" time="0.02" steps="170"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="170"/></proof>
   </goal>
   <goal name="WP_parameter strchrnul_ensures_default.7" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="178"/></proof>
+  <proof prover="0"><result status="valid" time="0.06" steps="178"/></proof>
   </goal>
   <goal name="WP_parameter strchrnul_ensures_default.8" expl="Assertion in line 15">
-  <proof prover="0"><result status="valid" time="0.02" steps="162"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="162"/></proof>
   </goal>
   <goal name="WP_parameter strchrnul_ensures_default.9" expl="Assertion in line 16">
-  <proof prover="0"><result status="valid" time="0.07" steps="375"/></proof>
+  <proof prover="0"><result status="valid" time="0.09" steps="375"/></proof>
   </goal>
   <goal name="WP_parameter strchrnul_ensures_default.10" expl="Ensures clause (Postcondition)">
   <proof prover="0"><result status="valid" time="0.05" steps="389"/></proof>
@@ -878,35 +878,35 @@
  </transf>
  </goal>
  <goal name="WP_parameter strchrnul_ensures_exists" expl="Function strchrnul, behavior exists" expanded="true">
- <proof prover="1"><result status="valid" time="0.10"/></proof>
+ <proof prover="1"><result status="valid" time="0.12"/></proof>
  </goal>
  <goal name="WP_parameter strchrnul_ensures_not_exists" expl="Function strchrnul, behavior not_exists" expanded="true">
- <proof prover="0"><result status="valid" time="0.71" steps="2761"/></proof>
+ <proof prover="0"><result status="valid" time="0.86" steps="2990"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_mem_safety" sum="0ecb7b59e069c1fa63c4b7a6ec6139a5" expanded="true">
  <goal name="WP_parameter strchrnul_mem" expl="Function strchrnul_mem, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.16"/></proof>
+ <proof prover="1"><result status="valid" time="0.20"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_mem_behaviors" sum="f567f14e5b674523a75a0b07ab6ec690" expanded="true">
  <goal name="WP_parameter strchrnul_mem_ensures_default" expl="Function strchrnul_mem, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="1.25" steps="4101"/></proof>
+ <proof prover="0"><result status="valid" time="1.43" steps="4101"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_res_safety" sum="8249ee8dee33afd21a51a5e9d6d58896" expanded="true">
  <goal name="WP_parameter strchrnul_res" expl="Function strchrnul_res, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.07"/></proof>
+ <proof prover="1"><result status="valid" time="0.10"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_res_behaviors" sum="3579f01349c8ba4bb969c8e728fb3c7e" expanded="true">
  <goal name="WP_parameter strchrnul_res_ensures_default" expl="Function strchrnul_res, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.20" steps="1504"/></proof>
+ <proof prover="0"><result status="valid" time="0.23" steps="1504"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_strlen_safety" sum="e1f64d3c8d274d90b2c5bd2d985d221f" expanded="true">
  <goal name="WP_parameter strchrnul_strlen" expl="Function strchrnul_strlen, safety" expanded="true">
- <proof prover="0"><result status="valid" time="1.12" steps="5473"/></proof>
+ <proof prover="0"><result status="valid" time="1.25" steps="5743"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_strlen_behaviors" sum="57b4c9f173edfbadf212449461888323" expanded="true">
@@ -916,22 +916,22 @@
 </theory>
 <theory name="Function_strchrnul_defn_safety" sum="7a3a74e6e8ad7fc1e83724688d1cd95a" expanded="true">
  <goal name="WP_parameter strchrnul_defn" expl="Function strchrnul_defn, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.08"/></proof>
+ <proof prover="1"><result status="valid" time="0.10"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_defn_behaviors" sum="3f2d01e0ad031472c00921ee07624a92" expanded="true">
  <goal name="WP_parameter strchrnul_defn_ensures_default" expl="Function strchrnul_defn, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="0.15"/></proof>
+ <proof prover="1"><result status="valid" time="0.19"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_skipped_safety" sum="d18d3718ecf438c4d3979e64440a904c" expanded="true">
  <goal name="WP_parameter strchrnul_skipped" expl="Function strchrnul_skipped, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.09"/></proof>
+ <proof prover="1"><result status="valid" time="0.13"/></proof>
  </goal>
 </theory>
 <theory name="Function_strchrnul_skipped_behaviors" sum="a78d791e9bc621a199fd25226a3e359b" expanded="true">
  <goal name="WP_parameter strchrnul_skipped_ensures_default" expl="Function strchrnul_skipped, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.10" steps="735"/></proof>
+ <proof prover="0"><result status="valid" time="0.16" steps="735"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/strcmp.av/whole_program/why3session.xml b/sessions/strcmp.av/whole_program/why3session.xml
index 3330a96..6b9fb12 100644
--- a/sessions/strcmp.av/whole_program/why3session.xml
+++ b/sessions/strcmp.av/whole_program/why3session.xml
@@ -822,58 +822,58 @@
 </theory>
 <theory name="Function_strcmp_0_safety" sum="3fa2f1de77d6b4509201a03d07858758" expanded="true">
  <goal name="WP_parameter strcmp_0" expl="Function strcmp, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.82" steps="4631"/></proof>
+ <proof prover="0"><result status="valid" time="0.95" steps="4631"/></proof>
  </goal>
 </theory>
 <theory name="Function_strcmp_0_behaviors" sum="500665610de1eb622b0c0ec7ef3011be" expanded="true">
  <goal name="WP_parameter strcmp_ensures_default" expl="Function strcmp, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter strcmp_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.03" steps="155"/></proof>
+  <proof prover="0"><result status="valid" time="0.05" steps="155"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.03" steps="153"/></proof>
+  <proof prover="0"><result status="valid" time="0.05" steps="153"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.3" expl="Assertion in line 7">
-  <proof prover="2"><result status="valid" time="0.07" steps="27892"/></proof>
+  <proof prover="2"><result status="valid" time="0.09" steps="27892"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.4" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.13" steps="1238"/></proof>
+  <proof prover="0"><result status="valid" time="0.18" steps="1238"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.5" expl="Assertion in line 27">
-  <proof prover="0"><result status="valid" time="0.35" steps="2333"/></proof>
+  <proof prover="0"><result status="valid" time="0.41" steps="2333"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.6" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.74" steps="2423"/></proof>
+  <proof prover="0"><result status="valid" time="0.88" steps="2423"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.7" expl="Ensures clause (Postcondition)">
   <proof prover="0"><result status="valid" time="0.03" steps="217"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.8" expl="Assertion in line 27">
-  <proof prover="0"><result status="valid" time="0.32" steps="2123"/></proof>
+  <proof prover="0"><result status="valid" time="0.41" steps="2324"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.9" expl="Ensures clause (Postcondition)">
   <proof prover="0"><result status="valid" time="0.03" steps="213"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.10" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.76" steps="2885"/></proof>
+  <proof prover="0"><result status="valid" time="0.89" steps="2885"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.11" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="1.71" steps="3425"/></proof>
+  <proof prover="1"><result status="valid" time="0.71"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.12" expl="Assertion in line 37">
-  <proof prover="0"><result status="valid" time="0.29" steps="1533"/></proof>
+  <proof prover="0"><result status="valid" time="0.32" steps="1533"/></proof>
   </goal>
   <goal name="WP_parameter strcmp_ensures_default.13" expl="loop invariant preservation">
   <transf name="split_goal_wp" expanded="true">
    <goal name="WP_parameter strcmp_ensures_default.13.1" expl="Function strcmp, default behavior">
-   <proof prover="1"><result status="valid" time="0.25"/></proof>
+   <proof prover="1"><result status="valid" time="0.31"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.2" expl="Function strcmp, default behavior">
-   <proof prover="1"><result status="valid" time="0.29"/></proof>
+   <proof prover="1"><result status="valid" time="0.36"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.3" expl="Function strcmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.04" steps="211"/></proof>
+   <proof prover="0"><result status="valid" time="0.05" steps="211"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.4" expl="Function strcmp, default behavior">
    <proof prover="0"><result status="valid" time="0.05" steps="211"/></proof>
@@ -882,41 +882,41 @@
    <proof prover="0"><result status="valid" time="0.04" steps="211"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.6" expl="Function strcmp, default behavior">
-   <proof prover="1"><result status="valid" time="0.30"/></proof>
+   <proof prover="1"><result status="valid" time="0.40"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.7" expl="Function strcmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.04" steps="219"/></proof>
+   <proof prover="0"><result status="valid" time="0.05" steps="219"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.8" expl="Function strcmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="219"/></proof>
+   <proof prover="0"><result status="valid" time="0.07" steps="219"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.9" expl="Function strcmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.04" steps="219"/></proof>
+   <proof prover="0"><result status="valid" time="0.06" steps="219"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.10" expl="Function strcmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.17" steps="917"/></proof>
+   <proof prover="0"><result status="valid" time="0.21" steps="917"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.11" expl="Function strcmp, default behavior">
    <proof prover="0"><result status="valid" time="0.05" steps="227"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.12" expl="Function strcmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="233"/></proof>
+   <proof prover="0"><result status="valid" time="0.07" steps="233"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.13" expl="Function strcmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.23" steps="1045"/></proof>
+   <proof prover="0"><result status="valid" time="0.37" steps="1045"/></proof>
    </goal>
    <goal name="WP_parameter strcmp_ensures_default.13.14" expl="Function strcmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.81" steps="3255"/></proof>
+   <proof prover="0"><result status="valid" time="0.89" steps="3255"/></proof>
    </goal>
   </transf>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter strcmp_ensures_equal" expl="Function strcmp, behavior equal" expanded="true">
- <proof prover="0"><result status="valid" time="0.04" steps="213"/></proof>
+ <proof prover="0"><result status="valid" time="0.06" steps="213"/></proof>
  </goal>
  <goal name="WP_parameter strcmp_ensures_not_equal" expl="Function strcmp, behavior not_equal" expanded="true">
- <proof prover="1"><result status="valid" time="1.25"/></proof>
+ <proof prover="1"><result status="valid" time="1.76"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/strcpy.av/whole_program/why3session.xml b/sessions/strcpy.av/whole_program/why3session.xml
index 079cf8a..e56ecad 100644
--- a/sessions/strcpy.av/whole_program/why3session.xml
+++ b/sessions/strcpy.av/whole_program/why3session.xml
@@ -2,81 +2,9 @@
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
 "http://why3.lri.fr/why3session.dtd">
 <why3session shape_version="4">
-<prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="5" steplimit="0" memlimit="4000"/>
-<prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="5" steplimit="0" memlimit="4000"/>
+<prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
+<prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
-<theory name="Function_strcpy_safety" sum="c31df2ae6f0e6ab1fee15747fc3a927e" expanded="true">
- <goal name="WP_parameter strcpy" expl="Function strcpy, safety" expanded="true">
- <proof prover="1" timelimit="2" memlimit="2000"><result status="valid" time="0.09"/></proof>
- </goal>
-</theory>
-<theory name="Function_strcpy_behaviors" sum="1e8c4f0bf0356cd4e4d99d1c9cfc7381" expanded="true">
- <goal name="WP_parameter strcpy_ensures_default" expl="Function strcpy, default behavior" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strcpy_ensures_default.1" expl="Assertion in line 7">
-  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.01" steps="16"/></proof>
-  </goal>
-  <goal name="WP_parameter strcpy_ensures_default.2" expl="loop invariant init">
-  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.16" steps="948"/></proof>
-  </goal>
-  <goal name="WP_parameter strcpy_ensures_default.3" expl="loop invariant preservation" expanded="true">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter strcpy_ensures_default.3.1" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.2" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.3" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.4" expl="Function strcpy, default behavior">
-   <proof prover="1"><result status="valid" time="0.14"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.5" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.6" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.7" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.8" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.04" steps="499"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.9" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.12" steps="598"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.10" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="88"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.11" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.15" steps="644"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.12" expl="Function strcpy, default behavior">
-   <proof prover="0"><result status="valid" time="0.09" steps="697"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.13" expl="Assigns clause">
-   <proof prover="1"><result status="valid" time="0.10"/></proof>
-   </goal>
-   <goal name="WP_parameter strcpy_ensures_default.3.14" expl="Assigns clause">
-   <proof prover="1"><result status="valid" time="0.10"/></proof>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter strcpy_ensures_default.4" expl="Assertion in line 20">
-  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.21" steps="1225"/></proof>
-  </goal>
-  <goal name="WP_parameter strcpy_ensures_default.5" expl="Assertion in line 21">
-  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.14" steps="482"/></proof>
-  </goal>
-  <goal name="WP_parameter strcpy_ensures_default.6" expl="Postcondition">
-  <proof prover="1" timelimit="2" memlimit="2000"><result status="valid" time="0.15"/></proof>
-  </goal>
- </transf>
- </goal>
-</theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
 <theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
@@ -877,5 +805,77 @@
 </theory>
 <theory name="Function_strcpy_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
+<theory name="Function_strcpy_safety" sum="c31df2ae6f0e6ab1fee15747fc3a927e" expanded="true">
+ <goal name="WP_parameter strcpy" expl="Function strcpy, safety" expanded="true">
+ <proof prover="1"><result status="valid" time="0.12"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strcpy_behaviors" sum="1e8c4f0bf0356cd4e4d99d1c9cfc7381" expanded="true">
+ <goal name="WP_parameter strcpy_ensures_default" expl="Function strcpy, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter strcpy_ensures_default.1" expl="Assertion in line 7">
+  <proof prover="0"><result status="valid" time="0.01" steps="16"/></proof>
+  </goal>
+  <goal name="WP_parameter strcpy_ensures_default.2" expl="loop invariant init">
+  <proof prover="0"><result status="valid" time="0.17" steps="948"/></proof>
+  </goal>
+  <goal name="WP_parameter strcpy_ensures_default.3" expl="loop invariant preservation">
+  <transf name="split_goal_wp" expanded="true">
+   <goal name="WP_parameter strcpy_ensures_default.3.1" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.2" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.3" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.4" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.90" steps="1482"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.5" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.6" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.7" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.8" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.05" steps="499"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.9" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.14" steps="598"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.10" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.02" steps="88"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.11" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.17" steps="651"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.12" expl="Function strcpy, default behavior">
+   <proof prover="0"><result status="valid" time="0.10" steps="698"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.13" expl="Assigns clause">
+   <proof prover="1"><result status="valid" time="0.12"/></proof>
+   </goal>
+   <goal name="WP_parameter strcpy_ensures_default.3.14" expl="Assigns clause">
+   <proof prover="1"><result status="valid" time="0.12"/></proof>
+   </goal>
+  </transf>
+  </goal>
+  <goal name="WP_parameter strcpy_ensures_default.4" expl="Assertion in line 20">
+  <proof prover="0"><result status="valid" time="0.25" steps="1225"/></proof>
+  </goal>
+  <goal name="WP_parameter strcpy_ensures_default.5" expl="Assertion in line 21">
+  <proof prover="0"><result status="valid" time="0.15" steps="482"/></proof>
+  </goal>
+  <goal name="WP_parameter strcpy_ensures_default.6" expl="Postcondition">
+  <proof prover="1"><result status="valid" time="0.20"/></proof>
+  </goal>
+ </transf>
+ </goal>
+</theory>
 </file>
 </why3session>
diff --git a/sessions/strcspn.av/whole_program/why3session.xml b/sessions/strcspn.av/whole_program/why3session.xml
index 37bcb8d..f2305bb 100644
--- a/sessions/strcspn.av/whole_program/why3session.xml
+++ b/sessions/strcspn.av/whole_program/why3session.xml
@@ -873,7 +873,7 @@
 </theory>
 <theory name="Function_strcspn_0_safety" sum="8cc313362fce8533ac41e011b8cf739e" expanded="true">
  <goal name="WP_parameter strcspn_0" expl="Function strcspn, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.13"/></proof>
+ <proof prover="1"><result status="valid" time="0.16"/></proof>
  </goal>
 </theory>
 <theory name="Function_strcspn_0_behaviors" sum="b55053eb83de1569f4b86a90d4af2b04" expanded="true">
@@ -883,39 +883,39 @@
   <proof prover="0"><result status="valid" time="0.01" steps="34"/></proof>
   </goal>
   <goal name="WP_parameter strcspn_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.01" steps="32"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="32"/></proof>
   </goal>
   <goal name="WP_parameter strcspn_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.17" steps="1159"/></proof>
+  <proof prover="0"><result status="valid" time="0.18" steps="1159"/></proof>
   </goal>
   <goal name="WP_parameter strcspn_ensures_default.4" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.47" steps="2915"/></proof>
+  <proof prover="0"><result status="valid" time="0.55" steps="2915"/></proof>
   </goal>
   <goal name="WP_parameter strcspn_ensures_default.5" expl="Assertion in line 30">
-  <proof prover="1"><result status="valid" time="0.22"/></proof>
+  <proof prover="1"><result status="valid" time="0.32"/></proof>
   </goal>
   <goal name="WP_parameter strcspn_ensures_default.6" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.14"/></proof>
+  <proof prover="1"><result status="valid" time="0.26"/></proof>
   </goal>
   <goal name="WP_parameter strcspn_ensures_default.7" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.41"/></proof>
+  <proof prover="1"><result status="valid" time="0.66"/></proof>
   </goal>
   <goal name="WP_parameter strcspn_ensures_default.8" expl="Assertion in line 33">
-  <proof prover="0"><result status="valid" time="0.02" steps="66"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="66"/></proof>
   </goal>
   <goal name="WP_parameter strcspn_ensures_default.9" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.62"/></proof>
+  <proof prover="1"><result status="valid" time="1.03"/></proof>
   </goal>
   <goal name="WP_parameter strcspn_ensures_default.10" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.22" steps="1577"/></proof>
+  <proof prover="0"><result status="valid" time="0.26" steps="1577"/></proof>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter strcspn_ensures_exists" expl="Function strcspn, behavior exists" expanded="true">
- <proof prover="1"><result status="valid" time="0.13"/></proof>
+ <proof prover="1"><result status="valid" time="0.19"/></proof>
  </goal>
  <goal name="WP_parameter strcspn_ensures_not_exists" expl="Function strcspn, behavior not_exists" expanded="true">
- <proof prover="1"><result status="valid" time="0.12"/></proof>
+ <proof prover="1"><result status="valid" time="0.16"/></proof>
  </goal>
 </theory>
 <theory name="Function_strcspn_strend_safety" sum="5cf89c657e0eb1d555f72fdfaf254bc1" expanded="true">
@@ -930,22 +930,22 @@
 </theory>
 <theory name="Function_strcspn_empty_accept_safety" sum="d37a07cef6df552079a2827a6c2ff85c" expanded="true">
  <goal name="WP_parameter strcspn_empty_accept" expl="Function strcspn_empty_accept, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.13" steps="739"/></proof>
+ <proof prover="0"><result status="valid" time="0.14" steps="739"/></proof>
  </goal>
 </theory>
 <theory name="Function_strcspn_empty_accept_behaviors" sum="a487037cde080d48eaf26ada68d87233" expanded="true">
  <goal name="WP_parameter strcspn_empty_accept_ensures_default" expl="Function strcspn_empty_accept, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="1.03" steps="3904"/></proof>
+ <proof prover="0"><result status="valid" time="1.17" steps="3904"/></proof>
  </goal>
 </theory>
 <theory name="Function_strcspn_range_safety" sum="9a1bb6bf5570cd90b4ac38126fc9baa0" expanded="true">
  <goal name="WP_parameter strcspn_range" expl="Function strcspn_range, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.26"/></proof>
+ <proof prover="1"><result status="valid" time="0.42"/></proof>
  </goal>
 </theory>
 <theory name="Function_strcspn_range_behaviors" sum="1417343b2f558120e6acd93f4a0070e2" expanded="true">
  <goal name="WP_parameter strcspn_range_ensures_default" expl="Function strcspn_range, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.31" steps="2805"/></proof>
+ <proof prover="0"><result status="valid" time="0.35" steps="2805"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/strlcpy.av/whole_program/why3session.xml b/sessions/strlcpy.av/whole_program/why3session.xml
index b41699a..e46f4ba 100644
--- a/sessions/strlcpy.av/whole_program/why3session.xml
+++ b/sessions/strlcpy.av/whole_program/why3session.xml
@@ -5,66 +5,6 @@
 <prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
 <prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
-<theory name="Function_strlcpy_safety" sum="19dd8efe41b01eb79f177c061eba1671" expanded="true">
- <goal name="WP_parameter strlcpy" expl="Function strlcpy, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.09"/></proof>
- </goal>
-</theory>
-<theory name="Function_strlcpy_behaviors" sum="4e0579f4b1883716bb5550d90101d088" expanded="true">
- <goal name="WP_parameter strlcpy_ensures_default" expl="Function strlcpy, default behavior" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strlcpy_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="156"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_default.2" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.01" steps="20"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_default.3" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.01" steps="20"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_default.4" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.01" steps="81"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_default.5" expl="Assertion in line 10">
-  <proof prover="0"><result status="valid" time="0.03" steps="185"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_default.6" expl="Assertion in line 12">
-  <proof prover="0"><result status="valid" time="0.03" steps="166"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_default.7" expl="Assertion in line 13">
-  <proof prover="0"><result status="valid" time="0.64" steps="2912"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_default.8" expl="Assertion in line 10">
-  <proof prover="0"><result status="valid" time="0.03" steps="209"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_default.9" expl="Assertion in line 12">
-  <proof prover="0"><result status="valid" time="0.02" steps="144"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_default.10" expl="Assertion in line 13">
-  <proof prover="0"><result status="valid" time="0.60" steps="2984"/></proof>
-  </goal>
- </transf>
- </goal>
- <goal name="WP_parameter strlcpy_ensures_size_is_greater_src" expl="Function strlcpy, behavior size_is_greater_src" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strlcpy_ensures_size_is_greater_src.1" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.02" steps="51"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_size_is_greater_src.2" expl="Postcondition">
-  <proof prover="1"><result status="valid" time="0.29"/></proof>
-  </goal>
-  <goal name="WP_parameter strlcpy_ensures_size_is_greater_src.3" expl="Postcondition">
-  <proof prover="0"><result status="valid" time="0.01" steps="78"/></proof>
-  </goal>
- </transf>
- </goal>
- <goal name="WP_parameter strlcpy_ensures_size_is_lower_src" expl="Function strlcpy, behavior size_is_lower_src" expanded="true">
- <proof prover="1"><result status="valid" time="0.67"/></proof>
- </goal>
- <goal name="WP_parameter strlcpy_ensures_zero_size" expl="Function strlcpy, behavior zero_size" expanded="true">
- <proof prover="0"><result status="valid" time="0.01" steps="46"/></proof>
- </goal>
-</theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
 <theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
@@ -871,5 +811,65 @@
 </theory>
 <theory name="Function_strlcpy_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
+<theory name="Function_strlcpy_safety" sum="19dd8efe41b01eb79f177c061eba1671" expanded="true">
+ <goal name="WP_parameter strlcpy" expl="Function strlcpy, safety" expanded="true">
+ <proof prover="1"><result status="valid" time="0.11"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strlcpy_behaviors" sum="4e0579f4b1883716bb5550d90101d088" expanded="true">
+ <goal name="WP_parameter strlcpy_ensures_default" expl="Function strlcpy, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter strlcpy_ensures_default.1" expl="Behavior disjointness check">
+  <proof prover="0"><result status="valid" time="0.03" steps="156"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_default.2" expl="Behavior disjointness check">
+  <proof prover="0"><result status="valid" time="0.01" steps="20"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_default.3" expl="Behavior disjointness check">
+  <proof prover="0"><result status="valid" time="0.01" steps="20"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_default.4" expl="Behavior completeness check">
+  <proof prover="0"><result status="valid" time="0.01" steps="81"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_default.5" expl="Assertion in line 10">
+  <proof prover="0"><result status="valid" time="0.04" steps="185"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_default.6" expl="Assertion in line 12">
+  <proof prover="0"><result status="valid" time="0.05" steps="166"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_default.7" expl="Assertion in line 13">
+  <proof prover="0"><result status="valid" time="0.80" steps="2912"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_default.8" expl="Assertion in line 10">
+  <proof prover="0"><result status="valid" time="0.04" steps="209"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_default.9" expl="Assertion in line 12">
+  <proof prover="0"><result status="valid" time="0.03" steps="144"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_default.10" expl="Assertion in line 13">
+  <proof prover="0"><result status="valid" time="0.79" steps="2984"/></proof>
+  </goal>
+ </transf>
+ </goal>
+ <goal name="WP_parameter strlcpy_ensures_size_is_greater_src" expl="Function strlcpy, behavior size_is_greater_src" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter strlcpy_ensures_size_is_greater_src.1" expl="Postcondition">
+  <proof prover="0"><result status="valid" time="0.03" steps="51"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_size_is_greater_src.2" expl="Postcondition">
+  <proof prover="1"><result status="valid" time="0.52"/></proof>
+  </goal>
+  <goal name="WP_parameter strlcpy_ensures_size_is_greater_src.3" expl="Postcondition">
+  <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
+  </goal>
+ </transf>
+ </goal>
+ <goal name="WP_parameter strlcpy_ensures_size_is_lower_src" expl="Function strlcpy, behavior size_is_lower_src" expanded="true">
+ <proof prover="1"><result status="valid" time="1.09"/></proof>
+ </goal>
+ <goal name="WP_parameter strlcpy_ensures_zero_size" expl="Function strlcpy, behavior zero_size" expanded="true">
+ <proof prover="0"><result status="valid" time="0.01" steps="46"/></proof>
+ </goal>
+</theory>
 </file>
 </why3session>
diff --git a/sessions/strlen.av/whole_program/why3session.xml b/sessions/strlen.av/whole_program/why3session.xml
index 9cc14dd..8776798 100644
--- a/sessions/strlen.av/whole_program/why3session.xml
+++ b/sessions/strlen.av/whole_program/why3session.xml
@@ -2,153 +2,9 @@
 <!DOCTYPE why3session PUBLIC "-//Why3//proof session v5//EN"
 "http://why3.lri.fr/why3session.dtd">
 <why3session shape_version="4">
-<prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="5" steplimit="0" memlimit="4000"/>
+<prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
 <prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
-<theory name="Function_strlen_0_safety" sum="813286ed6d090ddc51bc0ca0ae1d014f" expanded="true">
- <goal name="WP_parameter strlen_0" expl="Function strlen, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.07"/></proof>
- </goal>
-</theory>
-<theory name="Function_strlen_0_behaviors" sum="19e1f033314081f5bde8712d4fed7f2b" expanded="true">
- <goal name="WP_parameter strlen_ensures_default" expl="Function strlen, default behavior" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strlen_ensures_default.1" expl="loop invariant init" expanded="true">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter strlen_ensures_default.1.1" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="15"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.1.2" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="15"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.1.3" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="15"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.1.4" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="61"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.1.5" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="20"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.1.6" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="24"/></proof>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter strlen_ensures_default.2" expl="loop invariant preservation" expanded="true">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter strlen_ensures_default.2.1" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="37"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.2.2" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="37"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.2.3" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="37"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.2.4" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.30" steps="688"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.2.5" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.04" steps="298"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.2.6" expl="Function strlen, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="333"/></proof>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter strlen_ensures_default.3" expl="Ensures clause (Postcondition)" expanded="true">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter strlen_ensures_default.3.1" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.03" steps="214"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.3.2" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.01" steps="39"/></proof>
-   </goal>
-   <goal name="WP_parameter strlen_ensures_default.3.3" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.03" steps="243"/></proof>
-   </goal>
-  </transf>
-  </goal>
- </transf>
- </goal>
-</theory>
-<theory name="Function_elim_valid_str_safety" sum="a0e771227c2dbc8e7f7bbea89dda5ad4" expanded="true">
- <goal name="WP_parameter elim_valid_str" expl="Function elim_valid_str, safety" expanded="true">
- <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.33" steps="1368"/></proof>
- </goal>
-</theory>
-<theory name="Function_elim_valid_str_behaviors" sum="6a4a45666f9fbd70bbf6f9127129c26a" expanded="true">
- <goal name="WP_parameter elim_valid_str_ensures_default" expl="Function elim_valid_str, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="0.12"/></proof>
- </goal>
-</theory>
-<theory name="Function_elim_valid_str_len_safety" sum="3a90fabc834e9bb81b92293b80ad091a" expanded="true">
- <goal name="WP_parameter elim_valid_str_len" expl="Function elim_valid_str_len, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.07"/></proof>
- </goal>
-</theory>
-<theory name="Function_elim_valid_str_len_behaviors" sum="b630bff7145a90105f99a7defb495890" expanded="true">
- <goal name="WP_parameter elim_valid_str_len_ensures_default" expl="Function elim_valid_str_len, default behavior" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter elim_valid_str_len_ensures_default.1" expl="loop invariant init">
-  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.03" steps="268"/></proof>
-  </goal>
-  <goal name="WP_parameter elim_valid_str_len_ensures_default.2" expl="Function elim_valid_str_len, default behavior">
-  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.01" steps="29"/></proof>
-  </goal>
-  <goal name="WP_parameter elim_valid_str_len_ensures_default.3" expl="Ensures clause (Postcondition)">
-  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.06" steps="535"/></proof>
-  </goal>
-  <goal name="WP_parameter elim_valid_str_len_ensures_default.4" expl="Assertion in line 122">
-  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.03" steps="453"/></proof>
-  </goal>
-  <goal name="WP_parameter elim_valid_str_len_ensures_default.5" expl="loop invariant preservation">
-  <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.13" steps="1235"/></proof>
-  </goal>
- </transf>
- </goal>
-</theory>
-<theory name="Function_valid_str_len_safety" sum="b97e0b846abc4dbc11e867ffe0a00135" expanded="true">
- <goal name="WP_parameter valid_str_len" expl="Function valid_str_len, safety" expanded="true">
- <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.00" steps="10"/></proof>
- </goal>
-</theory>
-<theory name="Function_valid_str_len_behaviors" sum="6f5f1d74118980fa050b1630619d0d60" expanded="true">
- <goal name="WP_parameter valid_str_len_ensures_default" expl="Function valid_str_len, default behavior" expanded="true">
- <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.02" steps="102"/></proof>
- </goal>
-</theory>
-<theory name="Function_intro_valid_str_len_safety" sum="4998ded2f76c33a2bc1f4b0550cb7b59" expanded="true">
- <goal name="WP_parameter intro_valid_str_len" expl="Function intro_valid_str_len, safety" expanded="true">
- <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.00" steps="0"/></proof>
- </goal>
-</theory>
-<theory name="Function_intro_valid_str_len_behaviors" sum="91b49b55c7d40bfea83e743989e94296" expanded="true">
- <goal name="WP_parameter intro_valid_str_len_ensures_default" expl="Function intro_valid_str_len, default behavior" expanded="true">
- <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.03" steps="311"/></proof>
- </goal>
-</theory>
-<theory name="Function_valid_str_shift_safety" sum="a2edf9b651e75286ebc41c3b74abda63" expanded="true">
- <goal name="WP_parameter valid_str_shift" expl="Function valid_str_shift, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.08"/></proof>
- </goal>
-</theory>
-<theory name="Function_valid_str_shift_behaviors" sum="17aae8edfb8ed760ec108b279da06f12" expanded="true">
- <goal name="WP_parameter valid_str_shift_ensures_default" expl="Function valid_str_shift, default behavior" expanded="true">
- <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.01" steps="28"/></proof>
- </goal>
-</theory>
-<theory name="Function_elim_strlen_safety" sum="0a0f0414883b93651682555f4cebe550" expanded="true">
- <goal name="WP_parameter elim_strlen" expl="Function elim_strlen, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.07"/></proof>
- </goal>
-</theory>
-<theory name="Function_elim_strlen_behaviors" sum="674744110bde7ffd0e943518e5b123c6" expanded="true">
- <goal name="WP_parameter elim_strlen_ensures_default" expl="Function elim_strlen, default behavior" expanded="true">
- <proof prover="0" timelimit="2" memlimit="2000"><result status="valid" time="0.03" steps="464"/></proof>
- </goal>
-</theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
 <theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
@@ -945,5 +801,91 @@
 </theory>
 <theory name="Function_strlen_0_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
+<theory name="Function_strlen_0_safety" sum="813286ed6d090ddc51bc0ca0ae1d014f" expanded="true">
+ <goal name="WP_parameter strlen_0" expl="Function strlen, safety" expanded="true">
+ <proof prover="1"><result status="valid" time="0.09"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strlen_0_behaviors" sum="52dde5a5940ecd7a02245c93819ea773" expanded="true">
+ <goal name="WP_parameter strlen_ensures_default" expl="Function strlen, default behavior" expanded="true">
+ <proof prover="1"><result status="valid" time="1.34"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_valid_str_safety" sum="a0e771227c2dbc8e7f7bbea89dda5ad4" expanded="true">
+ <goal name="WP_parameter elim_valid_str" expl="Function elim_valid_str, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.40" steps="1368"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_valid_str_behaviors" sum="6a4a45666f9fbd70bbf6f9127129c26a" expanded="true">
+ <goal name="WP_parameter elim_valid_str_ensures_default" expl="Function elim_valid_str, default behavior" expanded="true">
+ <proof prover="1"><result status="valid" time="0.14"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_valid_str_len_safety" sum="3a90fabc834e9bb81b92293b80ad091a" expanded="true">
+ <goal name="WP_parameter elim_valid_str_len" expl="Function elim_valid_str_len, safety" expanded="true">
+ <proof prover="1"><result status="valid" time="0.09"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_valid_str_len_behaviors" sum="b630bff7145a90105f99a7defb495890" expanded="true">
+ <goal name="WP_parameter elim_valid_str_len_ensures_default" expl="Function elim_valid_str_len, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter elim_valid_str_len_ensures_default.1" expl="loop invariant init">
+  <proof prover="0"><result status="valid" time="0.03" steps="268"/></proof>
+  </goal>
+  <goal name="WP_parameter elim_valid_str_len_ensures_default.2" expl="Function elim_valid_str_len, default behavior">
+  <proof prover="0"><result status="valid" time="0.01" steps="29"/></proof>
+  </goal>
+  <goal name="WP_parameter elim_valid_str_len_ensures_default.3" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.06" steps="535"/></proof>
+  </goal>
+  <goal name="WP_parameter elim_valid_str_len_ensures_default.4" expl="Assertion in line 122">
+  <proof prover="0"><result status="valid" time="0.04" steps="455"/></proof>
+  </goal>
+  <goal name="WP_parameter elim_valid_str_len_ensures_default.5" expl="loop invariant preservation">
+  <proof prover="0"><result status="valid" time="0.14" steps="1235"/></proof>
+  </goal>
+ </transf>
+ </goal>
+</theory>
+<theory name="Function_valid_str_len_safety" sum="b97e0b846abc4dbc11e867ffe0a00135" expanded="true">
+ <goal name="WP_parameter valid_str_len" expl="Function valid_str_len, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.01" steps="10"/></proof>
+ </goal>
+</theory>
+<theory name="Function_valid_str_len_behaviors" sum="6f5f1d74118980fa050b1630619d0d60" expanded="true">
+ <goal name="WP_parameter valid_str_len_ensures_default" expl="Function valid_str_len, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.02" steps="102"/></proof>
+ </goal>
+</theory>
+<theory name="Function_intro_valid_str_len_safety" sum="4998ded2f76c33a2bc1f4b0550cb7b59" expanded="true">
+ <goal name="WP_parameter intro_valid_str_len" expl="Function intro_valid_str_len, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.00" steps="0"/></proof>
+ </goal>
+</theory>
+<theory name="Function_intro_valid_str_len_behaviors" sum="91b49b55c7d40bfea83e743989e94296" expanded="true">
+ <goal name="WP_parameter intro_valid_str_len_ensures_default" expl="Function intro_valid_str_len, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.03" steps="311"/></proof>
+ </goal>
+</theory>
+<theory name="Function_valid_str_shift_safety" sum="a2edf9b651e75286ebc41c3b74abda63" expanded="true">
+ <goal name="WP_parameter valid_str_shift" expl="Function valid_str_shift, safety" expanded="true">
+ <proof prover="1"><result status="valid" time="0.10"/></proof>
+ </goal>
+</theory>
+<theory name="Function_valid_str_shift_behaviors" sum="17aae8edfb8ed760ec108b279da06f12" expanded="true">
+ <goal name="WP_parameter valid_str_shift_ensures_default" expl="Function valid_str_shift, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.01" steps="28"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_strlen_safety" sum="0a0f0414883b93651682555f4cebe550" expanded="true">
+ <goal name="WP_parameter elim_strlen" expl="Function elim_strlen, safety" expanded="true">
+ <proof prover="1"><result status="valid" time="0.09"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_strlen_behaviors" sum="674744110bde7ffd0e943518e5b123c6" expanded="true">
+ <goal name="WP_parameter elim_strlen_ensures_default" expl="Function elim_strlen, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.06" steps="464"/></proof>
+ </goal>
+</theory>
 </file>
 </why3session>
diff --git a/sessions/strnchr.av/whole_program/why3session.xml b/sessions/strnchr.av/whole_program/why3session.xml
index aa07541..9161058 100644
--- a/sessions/strnchr.av/whole_program/why3session.xml
+++ b/sessions/strnchr.av/whole_program/why3session.xml
@@ -861,7 +861,7 @@
 </theory>
 <theory name="Function_strnchr_safety" sum="9bc70793cf3f420779b914a183a3598b" expanded="true">
  <goal name="WP_parameter strnchr" expl="Function strnchr, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.05" steps="397"/></proof>
+ <proof prover="0"><result status="valid" time="0.06" steps="397"/></proof>
  </goal>
 </theory>
 <theory name="Function_strnchr_behaviors" sum="16ea9aa66034c5b0945a4e0ff8d6a38c" expanded="true">
@@ -874,18 +874,18 @@
   <proof prover="0"><result status="valid" time="0.03" steps="154"/></proof>
   </goal>
   <goal name="WP_parameter strnchr_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.11" steps="688"/></proof>
+  <proof prover="0"><result status="valid" time="0.13" steps="688"/></proof>
   </goal>
   <goal name="WP_parameter strnchr_ensures_default.4" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.62"/></proof>
+  <proof prover="1"><result status="valid" time="0.88"/></proof>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter strnchr_ensures_exists" expl="Function strnchr, behavior exists" expanded="true">
- <proof prover="0"><result status="valid" time="0.60" steps="1964"/></proof>
+ <proof prover="0"><result status="valid" time="0.76" steps="1964"/></proof>
  </goal>
  <goal name="WP_parameter strnchr_ensures_not_exists" expl="Function strnchr, behavior not_exists" expanded="true">
- <proof prover="0"><result status="valid" time="0.85" steps="2660"/></proof>
+ <proof prover="0"><result status="valid" time="1.04" steps="2660"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/strncmp.av/whole_program/why3session.xml b/sessions/strncmp.av/whole_program/why3session.xml
index 876d7bb..09237f1 100644
--- a/sessions/strncmp.av/whole_program/why3session.xml
+++ b/sessions/strncmp.av/whole_program/why3session.xml
@@ -4,201 +4,8 @@
 <why3session shape_version="4">
 <prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
 <prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
-<prover id="2" name="CVC4" version="1.7" timelimit="10" steplimit="0" memlimit="4000"/>
+<prover id="2" name="CVC4" version="1.7" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
-<theory name="Function_strncmp_0_safety" sum="a0ed73d0ae6401a3d2cf4011904d2fe6">
- <goal name="WP_parameter strncmp_0" expl="Function strncmp, safety">
- <proof prover="1"><result status="valid" time="0.17"/></proof>
- </goal>
-</theory>
-<theory name="Function_strncmp_0_behaviors" sum="3bba052a6ea9db036bead14eb4b0b705">
- <goal name="WP_parameter strncmp_ensures_default" expl="Function strncmp, default behavior">
- <transf name="split_goal_wp">
-  <goal name="WP_parameter strncmp_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="159"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.2" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.03" steps="153"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.3" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.03" steps="161"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.4" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.05" steps="470"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.5" expl="Assertion in line 10">
-  <transf name="split_goal_wp">
-   <goal name="WP_parameter strncmp_ensures_default.5.1" expl="Assertion in line 10">
-   <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="0.03" steps="157"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.5.2" expl="Assertion in line 10">
-   <transf name="remove_triggers">
-    <goal name="WP_parameter strncmp_ensures_default.5.2.1" expl="Assertion in line 10">
-    <proof prover="2"><result status="valid" time="0.04" steps="22978"/></proof>
-    </goal>
-   </transf>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.6" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.21" steps="1535"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.7" expl="Assertion in line 28">
-  <proof prover="1"><result status="valid" time="0.96"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.8" expl="Assertion in line 29">
-  <transf name="split_goal_wp">
-   <goal name="WP_parameter strncmp_ensures_default.8.1" expl="Assertion in line 29">
-   <proof prover="1" timelimit="10" memlimit="4000"><result status="valid" time="0.56"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.8.2" expl="Assertion in line 29">
-   <transf name="remove_triggers">
-    <goal name="WP_parameter strncmp_ensures_default.8.2.1" expl="Assertion in line 29">
-    <proof prover="1" timelimit="10" memlimit="4000"><result status="valid" time="0.75"/></proof>
-    </goal>
-   </transf>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.8.3" expl="Assertion in line 29">
-   <proof prover="1" timelimit="10" memlimit="4000"><result status="valid" time="0.45"/></proof>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.9" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="233"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.10" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="227"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.11" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="223"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.12" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="229"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.13" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="227"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.14" expl="Assertion in line 43">
-  <proof prover="0"><result status="valid" time="0.36" steps="1418"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.15" expl="loop invariant preservation">
-  <transf name="split_goal_wp">
-   <goal name="WP_parameter strncmp_ensures_default.15.1" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="228"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.2" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="228"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.3" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="232"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.4" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="232"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.5" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="232"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.6" expl="Function strncmp, default behavior">
-   <proof prover="1"><result status="valid" time="0.35"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.7" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="240"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.8" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="240"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.9" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.05" steps="240"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.10" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.28" steps="962"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.11" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.06" steps="248"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.12" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.06" steps="248"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.13" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.62" steps="3525"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.14" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.38" steps="1075"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.15" expl="Function strncmp, default behavior">
-   <transf name="remove_triggers">
-    <goal name="WP_parameter strncmp_ensures_default.15.15.1" expl="Function strncmp, default behavior">
-    <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="0.33" steps="1069"/></proof>
-    </goal>
-   </transf>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.16" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.47" steps="1149"/></proof>
-   </goal>
-   <goal name="WP_parameter strncmp_ensures_default.15.17" expl="Function strncmp, default behavior">
-   <proof prover="0"><result status="valid" time="0.07" steps="264"/></proof>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_default.16" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="193"/></proof>
-  </goal>
- </transf>
- </goal>
- <goal name="WP_parameter strncmp_ensures_equal" expl="Function strncmp, behavior equal">
- <transf name="split_goal_wp">
-  <goal name="WP_parameter strncmp_ensures_equal.1" expl="Ensures clause (Postcondition)">
-  <proof prover="1" timelimit="10" memlimit="4000"><result status="valid" time="0.37"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_equal.2" expl="Ensures clause (Postcondition)">
-  <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="0.03" steps="227"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_equal.3" expl="Ensures clause (Postcondition)">
-  <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="0.03" steps="223"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_equal.4" expl="Ensures clause (Postcondition)">
-  <proof prover="1" timelimit="10" memlimit="4000"><result status="valid" time="0.40"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_equal.5" expl="Ensures clause (Postcondition)">
-  <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="0.03" steps="227"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_equal.6" expl="Ensures clause (Postcondition)">
-  <proof prover="0" timelimit="10" memlimit="4000"><result status="valid" time="0.03" steps="193"/></proof>
-  </goal>
- </transf>
- </goal>
- <goal name="WP_parameter strncmp_ensures_len_diff" expl="Function strncmp, behavior len_diff">
- <proof prover="1"><result status="valid" time="0.41"/></proof>
- </goal>
- <goal name="WP_parameter strncmp_ensures_not_equal" expl="Function strncmp, behavior not_equal">
- <transf name="split_goal_wp">
-  <goal name="WP_parameter strncmp_ensures_not_equal.1" expl="Assertion in line 33">
-  <proof prover="0"><result status="valid" time="0.70" steps="2433"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_not_equal.2" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.54"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_not_equal.3" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="245"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_not_equal.4" expl="Assertion in line 33">
-  <proof prover="0"><result status="valid" time="0.96" steps="3404"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_not_equal.5" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="241"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_not_equal.6" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.54"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_not_equal.7" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.05" steps="240"/></proof>
-  </goal>
-  <goal name="WP_parameter strncmp_ensures_not_equal.8" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.16" steps="687"/></proof>
-  </goal>
- </transf>
- </goal>
-</theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
 <theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
@@ -1059,5 +866,150 @@
 </theory>
 <theory name="Function_strncmp_0_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
+<theory name="Function_strncmp_0_safety" sum="a0ed73d0ae6401a3d2cf4011904d2fe6" expanded="true">
+ <goal name="WP_parameter strncmp_0" expl="Function strncmp, safety" expanded="true">
+ <proof prover="1"><result status="valid" time="0.21"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strncmp_0_behaviors" sum="648b7ec111a2dcb08b28e8b5fa018322" expanded="true">
+ <goal name="WP_parameter strncmp_ensures_default" expl="Function strncmp, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter strncmp_ensures_default.1" expl="Behavior disjointness check">
+  <proof prover="0"><result status="valid" time="0.03" steps="159"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.2" expl="Behavior disjointness check">
+  <proof prover="0"><result status="valid" time="0.03" steps="153"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.3" expl="Behavior disjointness check">
+  <proof prover="0"><result status="valid" time="0.03" steps="161"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.4" expl="Behavior completeness check">
+  <proof prover="0"><result status="valid" time="0.06" steps="470"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.5" expl="Assertion in line 10">
+  <proof prover="2"><result status="valid" time="0.06" steps="24531"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.6" expl="loop invariant init">
+  <proof prover="0"><result status="valid" time="0.22" steps="1535"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.7" expl="Assertion in line 28">
+  <proof prover="1"><result status="valid" time="1.34"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.8" expl="Assertion in line 29">
+  <proof prover="1"><result status="valid" time="1.69"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.9" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.03" steps="233"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.10" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.03" steps="227"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.11" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.03" steps="223"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.12" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.03" steps="229"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.13" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.03" steps="227"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.14" expl="Assertion in line 43">
+  <proof prover="0"><result status="valid" time="0.41" steps="1418"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.15" expl="loop invariant preservation">
+  <transf name="split_goal_wp" expanded="true">
+   <goal name="WP_parameter strncmp_ensures_default.15.1" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.06" steps="228"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.2" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.06" steps="228"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.3" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.06" steps="232"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.4" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.06" steps="232"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.5" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.06" steps="232"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.6" expl="Function strncmp, default behavior">
+   <proof prover="1"><result status="valid" time="0.46"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.7" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.06" steps="240"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.8" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.07" steps="240"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.9" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.06" steps="240"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.10" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.33" steps="962"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.11" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.06" steps="248"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.12" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.06" steps="248"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.13" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.73" steps="3538"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.14" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.45" steps="1085"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.15" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="1.27" steps="3774"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.16" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.53" steps="1148"/></proof>
+   </goal>
+   <goal name="WP_parameter strncmp_ensures_default.15.17" expl="Function strncmp, default behavior">
+   <proof prover="0"><result status="valid" time="0.08" steps="264"/></proof>
+   </goal>
+  </transf>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_default.16" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.03" steps="193"/></proof>
+  </goal>
+ </transf>
+ </goal>
+ <goal name="WP_parameter strncmp_ensures_equal" expl="Function strncmp, behavior equal" expanded="true">
+ <proof prover="1"><result status="valid" time="0.45"/></proof>
+ </goal>
+ <goal name="WP_parameter strncmp_ensures_len_diff" expl="Function strncmp, behavior len_diff" expanded="true">
+ <proof prover="1"><result status="valid" time="0.53"/></proof>
+ </goal>
+ <goal name="WP_parameter strncmp_ensures_not_equal" expl="Function strncmp, behavior not_equal" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter strncmp_ensures_not_equal.1" expl="Assertion in line 33">
+  <proof prover="0"><result status="valid" time="1.02" steps="2574"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_not_equal.2" expl="Ensures clause (Postcondition)">
+  <proof prover="1"><result status="valid" time="0.74"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_not_equal.3" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.04" steps="245"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_not_equal.4" expl="Assertion in line 33">
+  <proof prover="0"><result status="valid" time="1.22" steps="3424"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_not_equal.5" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.03" steps="241"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_not_equal.6" expl="Ensures clause (Postcondition)">
+  <proof prover="1"><result status="valid" time="0.73"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_not_equal.7" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.05" steps="240"/></proof>
+  </goal>
+  <goal name="WP_parameter strncmp_ensures_not_equal.8" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.17" steps="687"/></proof>
+  </goal>
+ </transf>
+ </goal>
+</theory>
 </file>
 </why3session>
diff --git a/sessions/strnlen.av/whole_program/why3session.xml b/sessions/strnlen.av/whole_program/why3session.xml
index ba204ce..50e902d 100644
--- a/sessions/strnlen.av/whole_program/why3session.xml
+++ b/sessions/strnlen.av/whole_program/why3session.xml
@@ -5,181 +5,6 @@
 <prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
 <prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
-<theory name="Function_strnlen_0_safety" sum="881913f87f0b83683671ad442d093cc2" expanded="true">
- <goal name="WP_parameter strnlen_0" expl="Function strnlen, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.15"/></proof>
- </goal>
-</theory>
-<theory name="Function_strnlen_0_behaviors" sum="36bb687f127ef0aa2ac4f961d31318ca" expanded="true">
- <goal name="WP_parameter strnlen_ensures_count_len" expl="Function strnlen, behavior count_len" expanded="true">
- <proof prover="0"><result status="valid" time="0.07" steps="552"/></proof>
- </goal>
- <goal name="WP_parameter strnlen_ensures_default" expl="Function strnlen, default behavior" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strnlen_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="150"/></proof>
-  </goal>
-  <goal name="WP_parameter strnlen_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="148"/></proof>
-  </goal>
-  <goal name="WP_parameter strnlen_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.11" steps="866"/></proof>
-  </goal>
-  <goal name="WP_parameter strnlen_ensures_default.4" expl="loop invariant preservation" expanded="true">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter strnlen_ensures_default.4.1" expl="Function strnlen, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.03" steps="186"/></proof>
-   </goal>
-   <goal name="WP_parameter strnlen_ensures_default.4.2" expl="Function strnlen, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.03" steps="186"/></proof>
-   </goal>
-   <goal name="WP_parameter strnlen_ensures_default.4.3" expl="Function strnlen, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.03" steps="190"/></proof>
-   </goal>
-   <goal name="WP_parameter strnlen_ensures_default.4.4" expl="Function strnlen, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.03" steps="190"/></proof>
-   </goal>
-   <goal name="WP_parameter strnlen_ensures_default.4.5" expl="Function strnlen, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.03" steps="190"/></proof>
-   </goal>
-   <goal name="WP_parameter strnlen_ensures_default.4.6" expl="Function strnlen, default behavior">
-   <proof prover="1" timelimit="5" memlimit="4000"><result status="valid" time="0.15"/></proof>
-   </goal>
-   <goal name="WP_parameter strnlen_ensures_default.4.7" expl="Function strnlen, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.09" steps="544"/></proof>
-   </goal>
-   <goal name="WP_parameter strnlen_ensures_default.4.8" expl="Function strnlen, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.08" steps="556"/></proof>
-   </goal>
-   <goal name="WP_parameter strnlen_ensures_default.4.9" expl="Function strnlen, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.09" steps="588"/></proof>
-   </goal>
-   <goal name="WP_parameter strnlen_ensures_default.4.10" expl="Function strnlen, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.09" steps="590"/></proof>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter strnlen_ensures_default.5" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.07" steps="431"/></proof>
-  </goal>
-  <goal name="WP_parameter strnlen_ensures_default.6" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.06" steps="404"/></proof>
-  </goal>
- </transf>
- </goal>
- <goal name="WP_parameter strnlen_ensures_null_byte" expl="Function strnlen, behavior null_byte" expanded="true">
- <proof prover="1"><result status="valid" time="0.08"/></proof>
- </goal>
-</theory>
-<theory name="Function_elim_valid_strn_safety" sum="2ea6be1f82deb67215ea134ed15df377" expanded="true">
- <goal name="WP_parameter elim_valid_strn" expl="Function elim_valid_strn, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.46" steps="2401"/></proof>
- </goal>
-</theory>
-<theory name="Function_elim_valid_strn_behaviors" sum="313104972206698924b42ef78d02e317" expanded="true">
- <goal name="WP_parameter elim_valid_strn_ensures_default" expl="Function elim_valid_strn, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="1.07"/></proof>
- </goal>
-</theory>
-<theory name="Function_elim_valid_strn_len_safety" sum="1902057f7097b861b023235c405cabec" expanded="true">
- <goal name="WP_parameter elim_valid_strn_len" expl="Function elim_valid_strn_len, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.89" steps="2836"/></proof>
- </goal>
-</theory>
-<theory name="Function_elim_valid_strn_len_behaviors" sum="25f852e245d177ee64df5f9039ecef8b" expanded="true">
- <goal name="WP_parameter elim_valid_strn_len_ensures_default" expl="Function elim_valid_strn_len, default behavior" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter elim_valid_strn_len_ensures_default.1" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.03" steps="298"/></proof>
-  </goal>
-  <goal name="WP_parameter elim_valid_strn_len_ensures_default.2" expl="Function elim_valid_strn_len, default behavior">
-  <proof prover="0"><result status="valid" time="0.01" steps="30"/></proof>
-  </goal>
-  <goal name="WP_parameter elim_valid_strn_len_ensures_default.3" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.83" steps="2499"/></proof>
-  </goal>
-  <goal name="WP_parameter elim_valid_strn_len_ensures_default.4" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.14" steps="1014"/></proof>
-  </goal>
-  <goal name="WP_parameter elim_valid_strn_len_ensures_default.5" expl="Assertion in line 155">
-  <proof prover="0"><result status="valid" time="1.03" steps="4067"/></proof>
-  </goal>
-  <goal name="WP_parameter elim_valid_strn_len_ensures_default.6" expl="loop invariant preservation">
-  <proof prover="0"><result status="valid" time="0.55" steps="5432"/></proof>
-  </goal>
- </transf>
- </goal>
-</theory>
-<theory name="Function_valid_strn_len_safety" sum="ae21c8d50bbb07a4011dbf960d745fb7" expanded="true">
- <goal name="WP_parameter valid_strn_len" expl="Function valid_strn_len, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.01" steps="10"/></proof>
- </goal>
-</theory>
-<theory name="Function_valid_strn_len_behaviors" sum="241d169ffc47355b246796f3e2f9add6" expanded="true">
- <goal name="WP_parameter valid_strn_len_ensures_default" expl="Function valid_strn_len, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.02" steps="126"/></proof>
- </goal>
-</theory>
-<theory name="Function_intro_valid_strn_len_safety" sum="87c4fd42696cc1ba812b1e444e6efa77" expanded="true">
- <goal name="WP_parameter intro_valid_strn_len" expl="Function intro_valid_strn_len, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.00" steps="0"/></proof>
- </goal>
-</theory>
-<theory name="Function_intro_valid_strn_len_behaviors" sum="e3f147d2f12be636677315eda5b6dcc7" expanded="true">
- <goal name="WP_parameter intro_valid_strn_len_ensures_default" expl="Function intro_valid_strn_len, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.03" steps="332"/></proof>
- </goal>
-</theory>
-<theory name="Function_valid_strn_shift1_safety" sum="03630789a130ffa57b3c4bf18bc7d6f5" expanded="true">
- <goal name="WP_parameter valid_strn_shift1" expl="Function valid_strn_shift1, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.13"/></proof>
- </goal>
-</theory>
-<theory name="Function_valid_strn_shift1_behaviors" sum="b165bce53049f092619e024ae4dcdf8c" expanded="true">
- <goal name="WP_parameter valid_strn_shift1_ensures_default" expl="Function valid_strn_shift1, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.04" steps="474"/></proof>
- </goal>
-</theory>
-<theory name="Function_strnlen_range_safety" sum="79c8d00bd79fd5ab86f56b79e405e4fa" expanded="true">
- <goal name="WP_parameter strnlen_range" expl="Function strnlen_range, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.01" steps="0"/></proof>
- </goal>
-</theory>
-<theory name="Function_strnlen_range_behaviors" sum="35a72977f2fb37a0e9b4277ea0f4c865" expanded="true">
- <goal name="WP_parameter strnlen_range_ensures_default" expl="Function strnlen_range, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.01" steps="63"/></proof>
- </goal>
-</theory>
-<theory name="Function_valid_str_to_valid_strn_safety" sum="4eb8fd3053a12b391887b51b1b466ef3" expanded="true">
- <goal name="WP_parameter valid_str_to_valid_strn" expl="Function valid_str_to_valid_strn, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.00" steps="0"/></proof>
- </goal>
-</theory>
-<theory name="Function_valid_str_to_valid_strn_behaviors" sum="30effd04b0bb7e4a368b5131dc19b588" expanded="true">
- <goal name="WP_parameter valid_str_to_valid_strn_ensures_default" expl="Function valid_str_to_valid_strn, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.02" steps="110"/></proof>
- </goal>
-</theory>
-<theory name="Function_strnlen_min_len_safety" sum="c02756ec2578b7b859b5cfab639ab3c9" expanded="true">
- <goal name="WP_parameter strnlen_min_len" expl="Function strnlen_min_len, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.01" steps="0"/></proof>
- </goal>
-</theory>
-<theory name="Function_strnlen_min_len_behaviors" sum="ee459be24ef9ad370bc90d9e7392c225" expanded="true">
- <goal name="WP_parameter strnlen_min_len_ensures_default" expl="Function strnlen_min_len, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.04" steps="417"/></proof>
- </goal>
-</theory>
-<theory name="Function_strnlen_at_cnt_safety" sum="8a62ff9f956c3f87fa4a6417a84c783c" expanded="true">
- <goal name="WP_parameter strnlen_at_cnt" expl="Function strnlen_at_cnt, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.01" steps="0"/></proof>
- </goal>
-</theory>
-<theory name="Function_strnlen_at_cnt_behaviors" sum="c8e33fb202a5fcf004de0200844bec09" expanded="true">
- <goal name="WP_parameter strnlen_at_cnt_ensures_default" expl="Function strnlen_at_cnt, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.01" steps="34"/></proof>
- </goal>
-</theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
 <theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
@@ -1030,5 +855,149 @@
 </theory>
 <theory name="Function_strnlen_0_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
+<theory name="Function_strnlen_0_safety" sum="881913f87f0b83683671ad442d093cc2" expanded="true">
+ <goal name="WP_parameter strnlen_0" expl="Function strnlen, safety" expanded="true">
+ <proof prover="1"><result status="valid" time="0.20"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strnlen_0_behaviors" sum="2d90d84fd0de19306da3753af0a000eb" expanded="true">
+ <goal name="WP_parameter strnlen_ensures_count_len" expl="Function strnlen, behavior count_len" expanded="true">
+ <proof prover="0"><result status="valid" time="0.08" steps="552"/></proof>
+ </goal>
+ <goal name="WP_parameter strnlen_ensures_default" expl="Function strnlen, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter strnlen_ensures_default.1" expl="Behavior disjointness check">
+  <proof prover="0"><result status="valid" time="0.02" steps="150"/></proof>
+  </goal>
+  <goal name="WP_parameter strnlen_ensures_default.2" expl="Behavior completeness check">
+  <proof prover="0"><result status="valid" time="0.03" steps="148"/></proof>
+  </goal>
+  <goal name="WP_parameter strnlen_ensures_default.3" expl="loop invariant init">
+  <proof prover="0"><result status="valid" time="0.13" steps="866"/></proof>
+  </goal>
+  <goal name="WP_parameter strnlen_ensures_default.4" expl="loop invariant preservation">
+  <proof prover="0"><result status="valid" time="1.89" steps="8609"/></proof>
+  </goal>
+  <goal name="WP_parameter strnlen_ensures_default.5" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.07" steps="431"/></proof>
+  </goal>
+  <goal name="WP_parameter strnlen_ensures_default.6" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.07" steps="404"/></proof>
+  </goal>
+ </transf>
+ </goal>
+ <goal name="WP_parameter strnlen_ensures_null_byte" expl="Function strnlen, behavior null_byte" expanded="true">
+ <proof prover="1"><result status="valid" time="0.10"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_valid_strn_safety" sum="2ea6be1f82deb67215ea134ed15df377" expanded="true">
+ <goal name="WP_parameter elim_valid_strn" expl="Function elim_valid_strn, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.53" steps="2401"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_valid_strn_behaviors" sum="313104972206698924b42ef78d02e317" expanded="true">
+ <goal name="WP_parameter elim_valid_strn_ensures_default" expl="Function elim_valid_strn, default behavior" expanded="true">
+ <proof prover="1"><result status="valid" time="1.67"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_valid_strn_len_safety" sum="1902057f7097b861b023235c405cabec" expanded="true">
+ <goal name="WP_parameter elim_valid_strn_len" expl="Function elim_valid_strn_len, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="1.12" steps="2836"/></proof>
+ </goal>
+</theory>
+<theory name="Function_elim_valid_strn_len_behaviors" sum="25f852e245d177ee64df5f9039ecef8b" expanded="true">
+ <goal name="WP_parameter elim_valid_strn_len_ensures_default" expl="Function elim_valid_strn_len, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter elim_valid_strn_len_ensures_default.1" expl="loop invariant init">
+  <proof prover="0"><result status="valid" time="0.04" steps="298"/></proof>
+  </goal>
+  <goal name="WP_parameter elim_valid_strn_len_ensures_default.2" expl="Function elim_valid_strn_len, default behavior">
+  <proof prover="0"><result status="valid" time="0.01" steps="30"/></proof>
+  </goal>
+  <goal name="WP_parameter elim_valid_strn_len_ensures_default.3" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.31" steps="2053"/></proof>
+  </goal>
+  <goal name="WP_parameter elim_valid_strn_len_ensures_default.4" expl="Ensures clause (Postcondition)">
+  <proof prover="0"><result status="valid" time="0.16" steps="1014"/></proof>
+  </goal>
+  <goal name="WP_parameter elim_valid_strn_len_ensures_default.5" expl="Assertion in line 155">
+  <proof prover="0"><result status="valid" time="1.21" steps="4067"/></proof>
+  </goal>
+  <goal name="WP_parameter elim_valid_strn_len_ensures_default.6" expl="loop invariant preservation">
+  <proof prover="0"><result status="valid" time="0.55" steps="4420"/></proof>
+  </goal>
+ </transf>
+ </goal>
+</theory>
+<theory name="Function_valid_strn_len_safety" sum="ae21c8d50bbb07a4011dbf960d745fb7" expanded="true">
+ <goal name="WP_parameter valid_strn_len" expl="Function valid_strn_len, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.01" steps="10"/></proof>
+ </goal>
+</theory>
+<theory name="Function_valid_strn_len_behaviors" sum="241d169ffc47355b246796f3e2f9add6" expanded="true">
+ <goal name="WP_parameter valid_strn_len_ensures_default" expl="Function valid_strn_len, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.02" steps="126"/></proof>
+ </goal>
+</theory>
+<theory name="Function_intro_valid_strn_len_safety" sum="87c4fd42696cc1ba812b1e444e6efa77" expanded="true">
+ <goal name="WP_parameter intro_valid_strn_len" expl="Function intro_valid_strn_len, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.01" steps="0"/></proof>
+ </goal>
+</theory>
+<theory name="Function_intro_valid_strn_len_behaviors" sum="e3f147d2f12be636677315eda5b6dcc7" expanded="true">
+ <goal name="WP_parameter intro_valid_strn_len_ensures_default" expl="Function intro_valid_strn_len, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.03" steps="332"/></proof>
+ </goal>
+</theory>
+<theory name="Function_valid_strn_shift1_safety" sum="03630789a130ffa57b3c4bf18bc7d6f5" expanded="true">
+ <goal name="WP_parameter valid_strn_shift1" expl="Function valid_strn_shift1, safety" expanded="true">
+ <proof prover="1"><result status="valid" time="0.16"/></proof>
+ </goal>
+</theory>
+<theory name="Function_valid_strn_shift1_behaviors" sum="b165bce53049f092619e024ae4dcdf8c" expanded="true">
+ <goal name="WP_parameter valid_strn_shift1_ensures_default" expl="Function valid_strn_shift1, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.05" steps="474"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strnlen_range_safety" sum="79c8d00bd79fd5ab86f56b79e405e4fa" expanded="true">
+ <goal name="WP_parameter strnlen_range" expl="Function strnlen_range, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.01" steps="0"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strnlen_range_behaviors" sum="35a72977f2fb37a0e9b4277ea0f4c865" expanded="true">
+ <goal name="WP_parameter strnlen_range_ensures_default" expl="Function strnlen_range, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.02" steps="63"/></proof>
+ </goal>
+</theory>
+<theory name="Function_valid_str_to_valid_strn_safety" sum="4eb8fd3053a12b391887b51b1b466ef3" expanded="true">
+ <goal name="WP_parameter valid_str_to_valid_strn" expl="Function valid_str_to_valid_strn, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.00" steps="0"/></proof>
+ </goal>
+</theory>
+<theory name="Function_valid_str_to_valid_strn_behaviors" sum="30effd04b0bb7e4a368b5131dc19b588" expanded="true">
+ <goal name="WP_parameter valid_str_to_valid_strn_ensures_default" expl="Function valid_str_to_valid_strn, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.02" steps="110"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strnlen_min_len_safety" sum="c02756ec2578b7b859b5cfab639ab3c9" expanded="true">
+ <goal name="WP_parameter strnlen_min_len" expl="Function strnlen_min_len, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.00" steps="0"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strnlen_min_len_behaviors" sum="ee459be24ef9ad370bc90d9e7392c225" expanded="true">
+ <goal name="WP_parameter strnlen_min_len_ensures_default" expl="Function strnlen_min_len, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.05" steps="417"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strnlen_at_cnt_safety" sum="8a62ff9f956c3f87fa4a6417a84c783c" expanded="true">
+ <goal name="WP_parameter strnlen_at_cnt" expl="Function strnlen_at_cnt, safety" expanded="true">
+ <proof prover="0"><result status="valid" time="0.01" steps="0"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strnlen_at_cnt_behaviors" sum="c8e33fb202a5fcf004de0200844bec09" expanded="true">
+ <goal name="WP_parameter strnlen_at_cnt_ensures_default" expl="Function strnlen_at_cnt, default behavior" expanded="true">
+ <proof prover="0"><result status="valid" time="0.01" steps="34"/></proof>
+ </goal>
+</theory>
 </file>
 </why3session>
diff --git a/sessions/strpbrk.av/whole_program/why3session.xml b/sessions/strpbrk.av/whole_program/why3session.xml
index 117d44d..9b79601 100644
--- a/sessions/strpbrk.av/whole_program/why3session.xml
+++ b/sessions/strpbrk.av/whole_program/why3session.xml
@@ -3,142 +3,124 @@
 "http://why3.lri.fr/why3session.dtd">
 <why3session shape_version="4">
 <prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
-<prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
+<prover id="2" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
 <theory name="Function_strpbrk_0_safety" sum="0aab05d08bea8e5fc7c690104f5dce7e" expanded="true">
  <goal name="WP_parameter strpbrk_0" expl="Function strpbrk, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.07"/></proof>
+ <proof prover="2"><result status="valid" time="0.09"/></proof>
  </goal>
 </theory>
-<theory name="Function_strpbrk_0_behaviors" sum="88afc6fd9f286a310fd05e8ec3e3a140" expanded="true">
+<theory name="Function_strpbrk_0_behaviors" sum="fa894b59a29562d8b16950d3fbc34834" expanded="true">
  <goal name="WP_parameter strpbrk_ensures_default" expl="Function strpbrk, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strpbrk_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="34"/></proof>
+  <goal name="WP_parameter strpbrk_ensures_default.1" expl="Behavior disjointness check" expanded="true">
+  <proof prover="0"><result status="valid" time="0.01" steps="34"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_ensures_default.2" expl="Behavior completeness check">
+  <goal name="WP_parameter strpbrk_ensures_default.2" expl="Behavior completeness check" expanded="true">
   <proof prover="0"><result status="valid" time="0.02" steps="32"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.24" steps="1536"/></proof>
+  <goal name="WP_parameter strpbrk_ensures_default.3" expl="loop invariant init" expanded="true">
+  <proof prover="0"><result status="valid" time="0.26" steps="1536"/></proof>
   </goal>
   <goal name="WP_parameter strpbrk_ensures_default.4" expl="loop invariant init" expanded="true">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter strpbrk_ensures_default.4.1" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.02" steps="38"/></proof>
-   </goal>
-   <goal name="WP_parameter strpbrk_ensures_default.4.2" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.02" steps="38"/></proof>
-   </goal>
-   <goal name="WP_parameter strpbrk_ensures_default.4.3" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.02" steps="38"/></proof>
-   </goal>
-   <goal name="WP_parameter strpbrk_ensures_default.4.4" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.15" steps="532"/></proof>
-   </goal>
-   <goal name="WP_parameter strpbrk_ensures_default.4.5" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.01" steps="42"/></proof>
-   </goal>
-   <goal name="WP_parameter strpbrk_ensures_default.4.6" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.02" steps="55"/></proof>
-   </goal>
-   <goal name="WP_parameter strpbrk_ensures_default.4.7" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.01" steps="45"/></proof>
-   </goal>
-  </transf>
+  <proof prover="0"><result status="valid" time="0.59" steps="1834"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_ensures_default.5" expl="Assertion in line 27">
-  <proof prover="1"><result status="valid" time="0.29"/></proof>
+  <goal name="WP_parameter strpbrk_ensures_default.5" expl="Assertion in line 27" expanded="true">
+  <proof prover="2"><result status="valid" time="0.40"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_ensures_default.6" expl="Assertion in line 33">
-  <proof prover="0"><result status="valid" time="0.04" steps="83"/></proof>
+  <goal name="WP_parameter strpbrk_ensures_default.6" expl="Assertion in line 33" expanded="true">
+  <proof prover="0"><result status="valid" time="0.05" steps="83"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_ensures_default.7" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.37" steps="1560"/></proof>
+  <goal name="WP_parameter strpbrk_ensures_default.7" expl="Ensures clause (Postcondition)" expanded="true">
+  <proof prover="0"><result status="valid" time="0.46" steps="1560"/></proof>
   </goal>
   <goal name="WP_parameter strpbrk_ensures_default.8" expl="loop invariant preservation" expanded="true">
   <transf name="split_goal_wp" expanded="true">
    <goal name="WP_parameter strpbrk_ensures_default.8.1" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.04" steps="65"/></proof>
+   <proof prover="0" timelimit="5" memlimit="1000"><result status="valid" time="0.06" steps="65"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_default.8.2" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.04" steps="65"/></proof>
+   <proof prover="0" timelimit="5" memlimit="1000"><result status="valid" time="0.05" steps="65"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_default.8.3" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.03" steps="65"/></proof>
+   <proof prover="0" timelimit="5" memlimit="1000"><result status="valid" time="0.04" steps="65"/></proof>
    </goal>
-   <goal name="WP_parameter strpbrk_ensures_default.8.4" expl="Function strpbrk, default behavior">
-   <proof prover="1" timelimit="5" memlimit="4000"><result status="valid" time="0.36"/></proof>
+   <goal name="WP_parameter strpbrk_ensures_default.8.4" expl="Function strpbrk, default behavior" expanded="true">
+   <proof prover="2"><result status="valid" time="0.62"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_default.8.5" expl="Function strpbrk, default behavior">
-   <proof prover="1" timelimit="5" memlimit="4000"><result status="valid" time="0.45"/></proof>
+   <proof prover="2"><result status="valid" time="0.60"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_default.8.6" expl="Function strpbrk, default behavior">
-   <proof prover="1" timelimit="5" memlimit="4000"><result status="valid" time="0.09"/></proof>
+   <proof prover="0" timelimit="5" memlimit="1000"><result status="valid" time="0.72" steps="2451"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_default.8.7" expl="Function strpbrk, default behavior">
-   <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="0.05" steps="78"/></proof>
+   <proof prover="0" timelimit="5" memlimit="1000"><result status="valid" time="0.07" steps="78"/></proof>
    </goal>
   </transf>
   </goal>
-  <goal name="WP_parameter strpbrk_ensures_default.9" expl="Assertion in line 40">
-  <proof prover="0"><result status="valid" time="0.42" steps="1750"/></proof>
+  <goal name="WP_parameter strpbrk_ensures_default.9" expl="Assertion in line 40" expanded="true">
+  <proof prover="0"><result status="valid" time="0.47" steps="1750"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_ensures_default.10" expl="Assertion in line 41">
-  <proof prover="0"><result status="valid" time="0.10" steps="1064"/></proof>
+  <goal name="WP_parameter strpbrk_ensures_default.10" expl="Assertion in line 41" expanded="true">
+  <proof prover="0"><result status="valid" time="0.12" steps="1064"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_ensures_default.11" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.71"/></proof>
+  <goal name="WP_parameter strpbrk_ensures_default.11" expl="loop invariant preservation" expanded="true">
+  <proof prover="2"><result status="valid" time="1.16"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_ensures_default.12" expl="Ensures clause (Postcondition)">
+  <goal name="WP_parameter strpbrk_ensures_default.12" expl="Ensures clause (Postcondition)" expanded="true">
   <proof prover="0"><result status="valid" time="0.02" steps="40"/></proof>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter strpbrk_ensures_found" expl="Function strpbrk, behavior found" expanded="true">
  <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strpbrk_ensures_found.1" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="1.03" steps="2989"/></proof>
+  <goal name="WP_parameter strpbrk_ensures_found.1" expl="Ensures clause (Postcondition)" expanded="true">
+  <proof prover="0"><result status="valid" time="1.17" steps="2989"/></proof>
   </goal>
   <goal name="WP_parameter strpbrk_ensures_found.2" expl="Ensures clause (Postcondition)" expanded="true">
   <transf name="split_goal_wp" expanded="true">
    <goal name="WP_parameter strpbrk_ensures_found.2.1" expl="Ensures clause" expanded="true">
    <transf name="remove_triggers" expanded="true">
     <goal name="WP_parameter strpbrk_ensures_found.2.1.1" expl="Ensures clause">
-    <proof prover="0"><result status="valid" time="1.61" steps="2497"/></proof>
+    <proof prover="0"><result status="valid" time="1.81" steps="2497"/></proof>
     </goal>
    </transf>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_found.2.2" expl="Ensures clause" expanded="true">
    <transf name="remove_triggers" expanded="true">
-    <goal name="WP_parameter strpbrk_ensures_found.2.2.1" expl="Ensures clause">
-    <proof prover="0"><result status="valid" time="1.90" steps="3487"/></proof>
+    <goal name="WP_parameter strpbrk_ensures_found.2.2.1" expl="Ensures clause" expanded="true">
+    <transf name="introduce_premises" expanded="true">
+     <goal name="WP_parameter strpbrk_ensures_found.2.2.1.1" expl="Ensures clause">
+     <proof prover="0"><result status="valid" time="1.64" steps="2446"/></proof>
+     </goal>
+    </transf>
     </goal>
    </transf>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_found.2.3" expl="Ensures clause" expanded="true">
    <transf name="remove_triggers" expanded="true">
     <goal name="WP_parameter strpbrk_ensures_found.2.3.1" expl="Ensures clause">
-    <proof prover="0"><result status="valid" time="1.44" steps="2128"/></proof>
+    <proof prover="0"><result status="valid" time="1.76" steps="2640"/></proof>
     </goal>
    </transf>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_found.2.4" expl="Ensures clause" expanded="true">
    <transf name="remove_triggers" expanded="true">
     <goal name="WP_parameter strpbrk_ensures_found.2.4.1" expl="Ensures clause">
-    <proof prover="0"><result status="valid" time="1.65" steps="2570"/></proof>
+    <proof prover="0"><result status="valid" time="1.82" steps="2570"/></proof>
     </goal>
    </transf>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_found.2.5" expl="Ensures clause" expanded="true">
    <transf name="remove_triggers" expanded="true">
     <goal name="WP_parameter strpbrk_ensures_found.2.5.1" expl="Ensures clause">
-    <proof prover="0" timelimit="5" memlimit="4000"><result status="valid" time="1.56" steps="2537"/></proof>
+    <proof prover="0"><result status="valid" time="1.62" steps="2170"/></proof>
     </goal>
    </transf>
    </goal>
    <goal name="WP_parameter strpbrk_ensures_found.2.6" expl="Ensures clause">
-   <proof prover="1"><result status="valid" time="1.13"/></proof>
+   <proof prover="2"><result status="valid" time="1.50"/></proof>
    </goal>
   </transf>
   </goal>
@@ -150,52 +132,56 @@
 </theory>
 <theory name="Function_strpbrk_range_safety" sum="7007b2b29dac817db89e1a90c75927d1" expanded="true">
  <goal name="WP_parameter strpbrk_range" expl="Function strpbrk_range, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.25"/></proof>
+ <proof prover="2"><result status="valid" time="0.33"/></proof>
  </goal>
 </theory>
 <theory name="Function_strpbrk_range_behaviors" sum="13c35166ce24dccf2d17149e0fcd80db" expanded="true">
  <goal name="WP_parameter strpbrk_range_ensures_default" expl="Function strpbrk_range, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strpbrk_range_ensures_default.1" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.09" steps="737"/></proof>
+  <goal name="WP_parameter strpbrk_range_ensures_default.1" expl="Ensures clause (Postcondition)" expanded="true">
+  <proof prover="0"><result status="valid" time="0.43" steps="1802"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_range_ensures_default.2" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.35" steps="1802"/></proof>
+  <goal name="WP_parameter strpbrk_range_ensures_default.2" expl="Ensures clause (Postcondition)" expanded="true">
+  <proof prover="0"><result status="valid" time="0.04" steps="227"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_range_ensures_default.3" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="227"/></proof>
+  <goal name="WP_parameter strpbrk_range_ensures_default.3" expl="Ensures clause (Postcondition)" expanded="true">
+  <proof prover="0"><result status="valid" time="0.13" steps="227"/></proof>
   </goal>
  </transf>
  </goal>
 </theory>
-<theory name="Function_strpbrk_frame_safety" sum="d7a3cb5e6b3777af68ce63a2f9d92f8d" expanded="true">
+<theory name="Function_strpbrk_frame_safety" sum="cdc2df366bbff6509cdae8c1f2d6d088" expanded="true">
  <goal name="WP_parameter strpbrk_frame" expl="Function strpbrk_frame, safety" expanded="true">
  <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strpbrk_frame.1" expl="Integer cast (integer overflow)">
-  <proof prover="0"><result status="valid" time="0.01" steps="22"/></proof>
-  </goal>
-  <goal name="WP_parameter strpbrk_frame.2" expl="Pointer dereference (Validity)">
-  <proof prover="0"><result status="valid" time="0.01" steps="66"/></proof>
+  <goal name="WP_parameter strpbrk_frame.1" expl="Integer cast (integer overflow)" expanded="true">
+  <proof prover="0"><result status="valid" time="0.02" steps="66"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_frame.3" expl="Pointer dereference (Validity)">
+  <goal name="WP_parameter strpbrk_frame.2" expl="Pointer dereference (Validity)" expanded="true">
   <proof prover="0"><result status="valid" time="0.01" steps="30"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_frame.4" expl="Precondition for in_array (Requires clause. External)">
+  <goal name="WP_parameter strpbrk_frame.3" expl="Pointer dereference (Validity)" expanded="true">
   <proof prover="0"><result status="valid" time="0.01" steps="30"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_frame.5" expl="Integer cast (integer overflow)">
+  <goal name="WP_parameter strpbrk_frame.4" expl="Precondition for in_array (Requires clause. External)" expanded="true">
   <proof prover="0"><result status="valid" time="0.01" steps="32"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_frame.6" expl="Integer cast (integer overflow)">
-  <proof prover="0"><result status="valid" time="0.01" steps="42"/></proof>
+  <goal name="WP_parameter strpbrk_frame.5" expl="Integer cast (integer overflow)" expanded="true">
+  <proof prover="0"><result status="valid" time="0.02" steps="42"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_frame.7" expl="Integer cast (integer overflow)">
+  <goal name="WP_parameter strpbrk_frame.6" expl="Integer cast (integer overflow)" expanded="true">
   <proof prover="0"><result status="valid" time="0.01" steps="40"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_frame.8" expl="check">
+  <goal name="WP_parameter strpbrk_frame.7" expl="Integer cast (integer overflow)" expanded="true">
   <proof prover="0"><result status="valid" time="0.08" steps="456"/></proof>
   </goal>
-  <goal name="WP_parameter strpbrk_frame.9" expl="Precondition for strpbrk_frame (Internal. Requires clause)">
+  <goal name="WP_parameter strpbrk_frame.8" expl="check">
+  <transf name="split_goal_wp">
+   <goal name="WP_parameter strpbrk_frame.8.1" expl="check">
+   <proof prover="0"><result status="valid" time="0.02" steps="456"/></proof>
+   </goal>
+  </transf>
+  </goal>
+  <goal name="WP_parameter strpbrk_frame.9" expl="Precondition for strpbrk_frame (Internal. Requires clause)" expanded="true">
   <transf name="split_goal_wp" expanded="true">
    <goal name="WP_parameter strpbrk_frame.9.1" expl="Requires clause">
    <proof prover="0"><result status="valid" time="0.01" steps="8"/></proof>
@@ -225,31 +211,41 @@
    <proof prover="0"><result status="valid" time="0.01" steps="8"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_frame.9.10" expl="Requires clause">
-   <proof prover="0"><result status="valid" time="0.08" steps="428"/></proof>
+   <proof prover="0"><result status="valid" time="0.09" steps="428"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_frame.9.11" expl="Requires clause">
-   <proof prover="0"><result status="valid" time="0.08" steps="449"/></proof>
+   <proof prover="0"><result status="valid" time="0.09" steps="449"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_frame.9.12" expl="Requires clause">
-   <proof prover="0"><result status="valid" time="0.08" steps="577"/></proof>
+   <proof prover="0"><result status="valid" time="0.11" steps="577"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_frame.9.13" expl="Requires clause">
    <proof prover="0"><result status="valid" time="0.01" steps="42"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_frame.9.14" expl="Requires clause">
-   <proof prover="0"><result status="valid" time="0.02" steps="56"/></proof>
+   <proof prover="0"><result status="valid" time="0.03" steps="56"/></proof>
    </goal>
    <goal name="WP_parameter strpbrk_frame.9.15" expl="Requires clause">
-   <proof prover="0"><result status="valid" time="0.26" steps="1121"/></proof>
+   <proof prover="0"><result status="valid" time="0.35" steps="1121"/></proof>
    </goal>
   </transf>
   </goal>
  </transf>
  </goal>
 </theory>
-<theory name="Function_strpbrk_frame_behaviors" sum="64b79a675f560999e3ed1adf495719b9" expanded="true">
+<theory name="Function_strpbrk_frame_behaviors" sum="4e1b75573622e07b92066de05916f417" expanded="true">
  <goal name="WP_parameter strpbrk_frame_ensures_default" expl="Function strpbrk_frame, default behavior" expanded="true">
- <proof prover="1"><result status="valid" time="1.88"/></proof>
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter strpbrk_frame_ensures_default.1" expl="Ensures clause (Postcondition)" expanded="true">
+  <proof prover="2"><result status="valid" time="1.79"/></proof>
+  </goal>
+  <goal name="WP_parameter strpbrk_frame_ensures_default.2" expl="Ensures clause (Postcondition)" expanded="true">
+  <proof prover="0"><result status="valid" time="0.02" steps="27"/></proof>
+  </goal>
+  <goal name="WP_parameter strpbrk_frame_ensures_default.3" expl="Ensures clause (Postcondition)" expanded="true">
+  <proof prover="2"><result status="valid" time="0.06"/></proof>
+  </goal>
+ </transf>
  </goal>
 </theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
diff --git a/sessions/strrchr.av/whole_program/why3session.xml b/sessions/strrchr.av/whole_program/why3session.xml
index f9522cb..3312c01 100644
--- a/sessions/strrchr.av/whole_program/why3session.xml
+++ b/sessions/strrchr.av/whole_program/why3session.xml
@@ -807,20 +807,20 @@
 </theory>
 <theory name="Function_strrchr_safety" sum="507a3d27b9197cc24262a9564a8deb3c" expanded="true">
  <goal name="WP_parameter strrchr" expl="Function strrchr, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.35" steps="1683"/></proof>
+ <proof prover="0"><result status="valid" time="0.41" steps="1683"/></proof>
  </goal>
 </theory>
 <theory name="Function_strrchr_behaviors" sum="93389e1faa4a223041ff86404121c955" expanded="true">
  <goal name="WP_parameter strrchr_ensures_default" expl="Function strrchr, default behavior" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter strrchr_ensures_default.1" expl="Behavior disjointness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="155"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="155"/></proof>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.2" expl="Behavior completeness check">
-  <proof prover="0"><result status="valid" time="0.02" steps="153"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="153"/></proof>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.3" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.10" steps="755"/></proof>
+  <proof prover="0"><result status="valid" time="0.13" steps="755"/></proof>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.4" expl="loop invariant preservation">
   <transf name="split_goal_wp" expanded="true">
@@ -831,59 +831,59 @@
    <proof prover="0"><result status="valid" time="0.03" steps="186"/></proof>
    </goal>
    <goal name="WP_parameter strrchr_ensures_default.4.3" expl="Function strrchr, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="186"/></proof>
+   <proof prover="0"><result status="valid" time="0.04" steps="186"/></proof>
    </goal>
    <goal name="WP_parameter strrchr_ensures_default.4.4" expl="Function strrchr, default behavior">
    <proof prover="0"><result status="valid" time="0.04" steps="360"/></proof>
    </goal>
    <goal name="WP_parameter strrchr_ensures_default.4.5" expl="Function strrchr, default behavior">
-   <proof prover="0"><result status="valid" time="0.41" steps="1897"/></proof>
+   <proof prover="0"><result status="valid" time="0.54" steps="1897"/></proof>
    </goal>
    <goal name="WP_parameter strrchr_ensures_default.4.6" expl="Function strrchr, default behavior">
    <proof prover="0"><result status="valid" time="0.03" steps="202"/></proof>
    </goal>
    <goal name="WP_parameter strrchr_ensures_default.4.7" expl="Function strrchr, default behavior">
-   <proof prover="0"><result status="valid" time="0.18" steps="672"/></proof>
+   <proof prover="0"><result status="valid" time="0.22" steps="672"/></proof>
    </goal>
    <goal name="WP_parameter strrchr_ensures_default.4.8" expl="Function strrchr, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="207"/></proof>
+   <proof prover="0"><result status="valid" time="0.04" steps="207"/></proof>
    </goal>
    <goal name="WP_parameter strrchr_ensures_default.4.9" expl="Function strrchr, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="204"/></proof>
+   <proof prover="0"><result status="valid" time="0.04" steps="204"/></proof>
    </goal>
    <goal name="WP_parameter strrchr_ensures_default.4.10" expl="Function strrchr, default behavior">
-   <proof prover="0"><result status="valid" time="0.06" steps="662"/></proof>
+   <proof prover="0"><result status="valid" time="0.08" steps="662"/></proof>
    </goal>
   </transf>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.5" expl="Assertion in line 21">
-  <proof prover="0"><result status="valid" time="0.07" steps="457"/></proof>
+  <proof prover="0"><result status="valid" time="0.09" steps="457"/></proof>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.6" expl="Assertion in line 22">
-  <proof prover="0"><result status="valid" time="1.12" steps="1320"/></proof>
+  <proof prover="0"><result status="valid" time="1.38" steps="1320"/></proof>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.7" expl="Assertion in line 23">
-  <proof prover="1"><result status="valid" time="0.86"/></proof>
+  <proof prover="1"><result status="valid" time="1.42"/></proof>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.8" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.36"/></proof>
+  <proof prover="1"><result status="valid" time="0.51"/></proof>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.9" expl="Assertion in line 21">
-  <proof prover="0"><result status="valid" time="0.08" steps="463"/></proof>
+  <proof prover="0"><result status="valid" time="0.10" steps="463"/></proof>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.10" expl="Assertion in line 22">
-  <proof prover="0"><result status="valid" time="1.27" steps="1326"/></proof>
+  <proof prover="0"><result status="valid" time="1.53" steps="1326"/></proof>
   </goal>
   <goal name="WP_parameter strrchr_ensures_default.11" expl="Assertion in line 23">
-  <proof prover="0"><result status="valid" time="0.12" steps="478"/></proof>
+  <proof prover="0"><result status="valid" time="0.16" steps="478"/></proof>
   </goal>
  </transf>
  </goal>
  <goal name="WP_parameter strrchr_ensures_found" expl="Function strrchr, behavior found" expanded="true">
- <proof prover="0"><result status="valid" time="1.52" steps="4175"/></proof>
+ <proof prover="1"><result status="valid" time="0.80"/></proof>
  </goal>
  <goal name="WP_parameter strrchr_ensures_not_found" expl="Function strrchr, behavior not_found" expanded="true">
- <proof prover="0"><result status="valid" time="0.40" steps="1413"/></proof>
+ <proof prover="0"><result status="valid" time="0.54" steps="1413"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/strreplace.av/whole_program/why3session.xml b/sessions/strreplace.av/whole_program/why3session.xml
index 56809ae..3de050c 100644
--- a/sessions/strreplace.av/whole_program/why3session.xml
+++ b/sessions/strreplace.av/whole_program/why3session.xml
@@ -3,8 +3,106 @@
 "http://why3.lri.fr/why3session.dtd">
 <why3session shape_version="4">
 <prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
-<prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
+<prover id="2" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
+<theory name="Function_strreplace_safety" sum="fa27af991159bf7cdc136a0ed0229a96" expanded="true">
+ <goal name="WP_parameter strreplace" expl="Function strreplace, safety" expanded="true">
+ <proof prover="2"><result status="valid" time="0.10"/></proof>
+ </goal>
+</theory>
+<theory name="Function_strreplace_behaviors" sum="8705654c1421a029e9182d35e349806c" expanded="true">
+ <goal name="WP_parameter strreplace_ensures_default" expl="Function strreplace, default behavior" expanded="true">
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter strreplace_ensures_default.1" expl="loop invariant init">
+  <proof prover="0"><result status="valid" time="0.07" steps="470"/></proof>
+  </goal>
+  <goal name="WP_parameter strreplace_ensures_default.2" expl="loop invariant preservation" expanded="true">
+  <transf name="split_goal_wp" expanded="true">
+   <goal name="WP_parameter strreplace_ensures_default.2.1" expl="Function strreplace, default behavior" expanded="true">
+   <transf name="remove_triggers" expanded="true">
+    <goal name="WP_parameter strreplace_ensures_default.2.1.1" expl="Function strreplace, default behavior" expanded="true">
+    <transf name="introduce_premises" expanded="true">
+     <goal name="WP_parameter strreplace_ensures_default.2.1.1.1" expl="Function strreplace, default behavior" expanded="true">
+     <transf name="eliminate_if" expanded="true">
+      <goal name="WP_parameter strreplace_ensures_default.2.1.1.1.1" expl="Function strreplace, default behavior" expanded="true">
+      <transf name="inline_all" expanded="true">
+       <goal name="WP_parameter strreplace_ensures_default.2.1.1.1.1.1" expl="Function strreplace, default behavior">
+       <proof prover="2" timelimit="10" memlimit="8000"><result status="valid" time="2.95"/></proof>
+       </goal>
+      </transf>
+      </goal>
+     </transf>
+     </goal>
+    </transf>
+    </goal>
+   </transf>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.2" expl="Function strreplace, default behavior">
+   <proof prover="0"><result status="valid" time="0.57" steps="2500"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.3" expl="Function strreplace, default behavior">
+   <proof prover="0"><result status="valid" time="0.01" steps="55"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.4" expl="Function strreplace, default behavior">
+   <proof prover="0"><result status="valid" time="0.02" steps="55"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.5" expl="Function strreplace, default behavior">
+   <proof prover="0"><result status="valid" time="0.02" steps="55"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.6" expl="Function strreplace, default behavior">
+   <proof prover="2"><result status="valid" time="0.29"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.7" expl="Function strreplace, default behavior">
+   <proof prover="0"><result status="valid" time="0.27" steps="1276"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.8" expl="Function strreplace, default behavior">
+   <proof prover="0"><result status="valid" time="0.15" steps="510"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.9" expl="Function strreplace, default behavior">
+   <proof prover="0"><result status="valid" time="0.55" steps="1659"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.10" expl="Assigns clause">
+   <proof prover="2"><result status="valid" time="0.11"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.2.11" expl="Assigns clause">
+   <proof prover="2"><result status="valid" time="0.11"/></proof>
+   </goal>
+  </transf>
+  </goal>
+  <goal name="WP_parameter strreplace_ensures_default.3" expl="loop invariant preservation" expanded="true">
+  <proof prover="2"><result status="valid" time="0.72"/></proof>
+  </goal>
+  <goal name="WP_parameter strreplace_ensures_default.4" expl="Assertion in line 23" expanded="true">
+  <proof prover="0"><result status="valid" time="0.06" steps="260"/></proof>
+  </goal>
+  <goal name="WP_parameter strreplace_ensures_default.5" expl="Assertion in line 24" expanded="true">
+  <proof prover="0"><result status="valid" time="0.17" steps="817"/></proof>
+  </goal>
+  <goal name="WP_parameter strreplace_ensures_default.6" expl="Postcondition">
+  <transf name="split_goal_wp" expanded="true">
+   <goal name="WP_parameter strreplace_ensures_default.6.1" expl="Assigns clause" expanded="true">
+   <proof prover="0"><result status="valid" time="0.01" steps="42"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.6.2" expl="Ensures clause" expanded="true">
+   <proof prover="0"><result status="valid" time="0.01" steps="45"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.6.3" expl="Ensures clause" expanded="true">
+   <proof prover="0"><result status="valid" time="0.04" steps="322"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.6.4" expl="Ensures clause" expanded="true">
+   <proof prover="0"><result status="valid" time="0.04" steps="325"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.6.5" expl="Ensures clause" expanded="true">
+   <proof prover="0"><result status="valid" time="0.01" steps="42"/></proof>
+   </goal>
+   <goal name="WP_parameter strreplace_ensures_default.6.6" expl="Ensures clause" expanded="true">
+   <proof prover="2"><result status="valid" time="0.33"/></proof>
+   </goal>
+  </transf>
+  </goal>
+ </transf>
+ </goal>
+</theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
 <theory name="Int32_of_Int16" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
@@ -805,91 +903,5 @@
 </theory>
 <theory name="Function_strreplace_safe" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">
 </theory>
-<theory name="Function_strreplace_safety" sum="fa27af991159bf7cdc136a0ed0229a96" expanded="true">
- <goal name="WP_parameter strreplace" expl="Function strreplace, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.09"/></proof>
- </goal>
-</theory>
-<theory name="Function_strreplace_behaviors" sum="a335930fbdfd31bbc4e6b9300fd5de6f" expanded="true">
- <goal name="WP_parameter strreplace_ensures_default" expl="Function strreplace, default behavior" expanded="true">
- <transf name="split_goal_wp" expanded="true">
-  <goal name="WP_parameter strreplace_ensures_default.1" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.07" steps="470"/></proof>
-  </goal>
-  <goal name="WP_parameter strreplace_ensures_default.2" expl="loop invariant preservation">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter strreplace_ensures_default.2.1" expl="Function strreplace, default behavior">
-   <transf name="remove_triggers" expanded="true">
-    <goal name="WP_parameter strreplace_ensures_default.2.1.1" expl="Function strreplace, default behavior">
-    <proof prover="0"><result status="valid" time="1.75" steps="4357"/></proof>
-    </goal>
-   </transf>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.2" expl="Function strreplace, default behavior">
-   <proof prover="0"><result status="valid" time="0.48" steps="2505"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.3" expl="Function strreplace, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="55"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.4" expl="Function strreplace, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="55"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.5" expl="Function strreplace, default behavior">
-   <proof prover="0"><result status="valid" time="0.01" steps="55"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.6" expl="Function strreplace, default behavior">
-   <proof prover="1"><result status="valid" time="0.21"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.7" expl="Function strreplace, default behavior">
-   <proof prover="0"><result status="valid" time="0.24" steps="1276"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.8" expl="Function strreplace, default behavior">
-   <proof prover="0"><result status="valid" time="0.12" steps="510"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.9" expl="Function strreplace, default behavior">
-   <proof prover="0"><result status="valid" time="0.44" steps="1659"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.10" expl="Assigns clause">
-   <proof prover="1"><result status="valid" time="0.09"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.2.11" expl="Assigns clause">
-   <proof prover="1"><result status="valid" time="0.09"/></proof>
-   </goal>
-  </transf>
-  </goal>
-  <goal name="WP_parameter strreplace_ensures_default.3" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.51"/></proof>
-  </goal>
-  <goal name="WP_parameter strreplace_ensures_default.4" expl="Assertion in line 23">
-  <proof prover="0"><result status="valid" time="0.05" steps="260"/></proof>
-  </goal>
-  <goal name="WP_parameter strreplace_ensures_default.5" expl="Assertion in line 24">
-  <proof prover="0"><result status="valid" time="0.13" steps="817"/></proof>
-  </goal>
-  <goal name="WP_parameter strreplace_ensures_default.6" expl="Postcondition">
-  <transf name="split_goal_wp" expanded="true">
-   <goal name="WP_parameter strreplace_ensures_default.6.1" expl="Assigns clause">
-   <proof prover="0"><result status="valid" time="0.01" steps="42"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.6.2" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.01" steps="45"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.6.3" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.04" steps="322"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.6.4" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.03" steps="325"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.6.5" expl="Ensures clause">
-   <proof prover="0"><result status="valid" time="0.01" steps="42"/></proof>
-   </goal>
-   <goal name="WP_parameter strreplace_ensures_default.6.6" expl="Ensures clause">
-   <proof prover="1"><result status="valid" time="0.27"/></proof>
-   </goal>
-  </transf>
-  </goal>
- </transf>
- </goal>
-</theory>
 </file>
 </why3session>
diff --git a/sessions/strsep.av/whole_program/why3session.xml b/sessions/strsep.av/whole_program/why3session.xml
index f763842..a783993 100644
--- a/sessions/strsep.av/whole_program/why3session.xml
+++ b/sessions/strsep.av/whole_program/why3session.xml
@@ -883,7 +883,7 @@
 </theory>
 <theory name="Function_strsep_safety" sum="c2a30bbdf6e29e928077f42d94f81e1d" expanded="true">
  <goal name="WP_parameter strsep" expl="Function strsep, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.13" steps="937"/></proof>
+ <proof prover="0"><result status="valid" time="0.14" steps="937"/></proof>
  </goal>
 </theory>
 <theory name="Function_strsep_behaviors" sum="a1df2e10ca964865893ae448e67fce03" expanded="true">
@@ -894,10 +894,10 @@
  <proof prover="0"><result status="valid" time="0.02" steps="14"/></proof>
  </goal>
  <goal name="WP_parameter strsep_ensures_input_strpbrk_not_null" expl="Function strsep, behavior input_strpbrk_not_null" expanded="true">
- <proof prover="1"><result status="valid" time="0.15"/></proof>
+ <proof prover="1"><result status="valid" time="0.16"/></proof>
  </goal>
  <goal name="WP_parameter strsep_ensures_input_strpbrk_null" expl="Function strsep, behavior input_strpbrk_null" expanded="true">
- <proof prover="0"><result status="valid" time="0.89" steps="3587"/></proof>
+ <proof prover="0"><result status="valid" time="0.96" steps="3587"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/strspn.av/whole_program/why3session.xml b/sessions/strspn.av/whole_program/why3session.xml
index b7a18bc..4302c18 100644
--- a/sessions/strspn.av/whole_program/why3session.xml
+++ b/sessions/strspn.av/whole_program/why3session.xml
@@ -849,7 +849,7 @@
 </theory>
 <theory name="Function_strspn_0_safety" sum="0d6ddc48865e330ed59964bad65d4899" expanded="true">
  <goal name="WP_parameter strspn_0" expl="Function strspn, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.13"/></proof>
+ <proof prover="1"><result status="valid" time="0.16"/></proof>
  </goal>
 </theory>
 <theory name="Function_strspn_0_behaviors" sum="648e034c9644898e4f34af05d899565a" expanded="true">
@@ -859,28 +859,28 @@
   <proof prover="0"><result status="valid" time="0.14" steps="996"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.2" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.22" steps="1116"/></proof>
+  <proof prover="0"><result status="valid" time="0.24" steps="1116"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.3" expl="Assertion in line 32">
   <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.4" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.02" steps="81"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="81"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.5" expl="Assertion in line 34">
-  <proof prover="1"><result status="valid" time="0.22"/></proof>
+  <proof prover="1"><result status="valid" time="0.26"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.6" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.17"/></proof>
+  <proof prover="1"><result status="valid" time="0.19"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.7" expl="loop invariant preservation">
-  <proof prover="1"><result status="valid" time="0.42"/></proof>
+  <proof prover="1"><result status="valid" time="0.54"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.8" expl="Assertion in line 32">
   <proof prover="0"><result status="valid" time="0.02" steps="72"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.9" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.13"/></proof>
+  <proof prover="1"><result status="valid" time="0.17"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.10" expl="Assertion in line 34">
   <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
@@ -889,7 +889,7 @@
   <proof prover="0"><result status="valid" time="0.03" steps="83"/></proof>
   </goal>
   <goal name="WP_parameter strspn_ensures_default.12" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.59"/></proof>
+  <proof prover="1"><result status="valid" time="0.79"/></proof>
   </goal>
  </transf>
  </goal>
@@ -901,7 +901,7 @@
 </theory>
 <theory name="Function_in_array_shift1_behaviors" sum="62e6e439ea72be88de4ff83a794b6d04" expanded="true">
  <goal name="WP_parameter in_array_shift1_ensures_default" expl="Function in_array_shift1, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="1.28" steps="4617"/></proof>
+ <proof prover="0"><result status="valid" time="1.65" steps="4617"/></proof>
  </goal>
 </theory>
 <theory name="Function_in_array_true_safety" sum="6bc22c0e6daf4b1307fa356d6ac20ffe" expanded="true">
@@ -911,7 +911,7 @@
 </theory>
 <theory name="Function_in_array_true_behaviors" sum="b1a3a5a085a7629eca44df17492f6048" expanded="true">
  <goal name="WP_parameter in_array_true_ensures_default" expl="Function in_array_true, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.04" steps="528"/></proof>
+ <proof prover="0"><result status="valid" time="0.05" steps="528"/></proof>
  </goal>
 </theory>
 <theory name="Function_in_array_false_safety" sum="3822e385b1a2d7932d139d2dc1b98362" expanded="true">
@@ -931,37 +931,37 @@
 </theory>
 <theory name="Function_strspn_strend_behaviors" sum="83b9de9d592e21df1cb0bbb7a2139295" expanded="true">
  <goal name="WP_parameter strspn_strend_ensures_default" expl="Function strspn_strend, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.01" steps="86"/></proof>
+ <proof prover="0"><result status="valid" time="0.02" steps="86"/></proof>
  </goal>
 </theory>
 <theory name="Function_strspn_empty_accept_safety" sum="ab75df06544053c561cc200adc61e51a" expanded="true">
  <goal name="WP_parameter strspn_empty_accept" expl="Function strspn_empty_accept, safety" expanded="true">
- <proof prover="0"><result status="valid" time="0.00" steps="0"/></proof>
+ <proof prover="0"><result status="valid" time="0.01" steps="0"/></proof>
  </goal>
 </theory>
 <theory name="Function_strspn_empty_accept_behaviors" sum="fde38110a5e697d0a46ddca1626dd67a" expanded="true">
  <goal name="WP_parameter strspn_empty_accept_ensures_default" expl="Function strspn_empty_accept, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.22" steps="1686"/></proof>
+ <proof prover="0"><result status="valid" time="0.25" steps="1686"/></proof>
  </goal>
 </theory>
 <theory name="Function_in_array_0_safety" sum="e0d47f0c8ea2fb5ab4613759251c0627" expanded="true">
  <goal name="WP_parameter in_array_0" expl="Function in_array, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.18"/></proof>
+ <proof prover="1"><result status="valid" time="0.21"/></proof>
  </goal>
 </theory>
 <theory name="Function_in_array_0_behaviors" sum="cddf3fd3d0b09b5dce46f0dcda741a5f" expanded="true">
  <goal name="WP_parameter in_array_ensures_default" expl="Function in_array, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.50" steps="3564"/></proof>
+ <proof prover="0"><result status="valid" time="0.58" steps="3564"/></proof>
  </goal>
 </theory>
 <theory name="Function_strspn_range_safety" sum="bfd938b90511cd46c5b669f2b0822fe2" expanded="true">
  <goal name="WP_parameter strspn_range" expl="Function strspn_range, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.25"/></proof>
+ <proof prover="1"><result status="valid" time="0.33"/></proof>
  </goal>
 </theory>
 <theory name="Function_strspn_range_behaviors" sum="8ec98566cda1a16d6610d6868f2d2d67" expanded="true">
  <goal name="WP_parameter strspn_range_ensures_default" expl="Function strspn_range, default behavior" expanded="true">
- <proof prover="0"><result status="valid" time="0.33" steps="3035"/></proof>
+ <proof prover="0"><result status="valid" time="0.34" steps="2767"/></proof>
  </goal>
 </theory>
 </file>
diff --git a/sessions/sysfs_streq.av/whole_program/why3session.xml b/sessions/sysfs_streq.av/whole_program/why3session.xml
index 4bc715c..1a4f555 100644
--- a/sessions/sysfs_streq.av/whole_program/why3session.xml
+++ b/sessions/sysfs_streq.av/whole_program/why3session.xml
@@ -3,11 +3,282 @@
 "http://why3.lri.fr/why3session.dtd">
 <why3session shape_version="4">
 <prover id="0" name="Alt-Ergo" version="2.3.3" timelimit="2" steplimit="0" memlimit="2000"/>
-<prover id="1" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
+<prover id="2" name="CVC4" version="1.7" alternative="noBV" timelimit="2" steplimit="0" memlimit="2000"/>
 <file name="../whole_program.mlw" expanded="true">
-<theory name="Function_sysfs_streq_safety" sum="53db019c27283efa5a5580c2b37e6567" expanded="true">
+<theory name="Function_sysfs_streq_safety" sum="a46b58ecfe4cf08e40528cf02a11305a" expanded="true">
  <goal name="WP_parameter sysfs_streq" expl="Function sysfs_streq, safety" expanded="true">
- <proof prover="1"><result status="valid" time="0.82"/></proof>
+ <transf name="split_goal_wp" expanded="true">
+  <goal name="WP_parameter sysfs_streq.1" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="20"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.2" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="40"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.3" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.12" steps="630"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.4" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.15" steps="741"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.5" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.01" steps="52"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.6" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="60"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.7" expl="integer overflow">
+  <proof prover="0"><result status="valid" time="1.40" steps="1500"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.8" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="70"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.9" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.10" expl="loop variant decrease">
+  <proof prover="0"><result status="valid" time="0.03" steps="80"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.11" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.01" steps="56"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.12" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.01" steps="58"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.13" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.14" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="62"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.15" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.16" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="70"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.17" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.18" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.19" expl="Pointer dereference (Dereference by offset. Validity)">
+  <proof prover="0"><result status="valid" time="0.03" steps="80"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.20" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.04" steps="95"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.21" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="81"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.22" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="83"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.23" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="85"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.24" expl="Pointer dereference (Dereference by offset. Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="85"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.25" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="85"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.26" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="85"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.27" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="85"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.28" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="85"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.29" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="85"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.30" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="94"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.31" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.32" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="76"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.33" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.01" steps="78"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.34" expl="Pointer dereference (Dereference by offset. Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.35" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.36" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.37" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.38" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.01" steps="78"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.39" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.01" steps="78"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.40" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="87"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.41" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="70"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.42" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.43" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.44" expl="Pointer dereference (Dereference by offset. Validity)">
+  <proof prover="0"><result status="valid" time="0.13" steps="749"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.45" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="81"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.46" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="83"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.47" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.05" steps="99"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.48" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.05" steps="92"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.49" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.04" steps="88"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.50" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="81"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.51" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.18" steps="772"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.52" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="52"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.53" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.04" steps="66"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.54" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="56"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.55" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.01" steps="58"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.56" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.57" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.58" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="68"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.59" expl="Pointer dereference (Dereference by offset. Validity)">
+  <proof prover="0"><result status="valid" time="0.15" steps="689"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.60" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="89"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.61" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="75"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.62" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.01" steps="77"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.63" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="79"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.64" expl="Pointer dereference (Dereference by offset. Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="79"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.65" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="79"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.66" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="79"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.67" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="79"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.68" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="79"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.69" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="79"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.70" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.04" steps="88"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.71" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="68"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.72" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.73" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.74" expl="Pointer dereference (Dereference by offset. Validity)">
+  <proof prover="0"><result status="valid" time="0.01" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.75" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.76" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.03" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.77" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.78" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.79" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="72"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.80" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.07" steps="81"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.81" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.07" steps="64"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.82" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.03" steps="64"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.83" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="66"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.84" expl="Pointer dereference (Dereference by offset. Validity)">
+  <proof prover="0"><result status="valid" time="0.03" steps="66"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.85" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="66"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.86" expl="Pointer dereference (Validity)">
+  <proof prover="0"><result status="valid" time="0.03" steps="66"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.87" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="66"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.88" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.01" steps="66"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.89" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.02" steps="66"/></proof>
+  </goal>
+  <goal name="WP_parameter sysfs_streq.90" expl="Integer cast (integer overflow)">
+  <proof prover="0"><result status="valid" time="0.03" steps="75"/></proof>
+  </goal>
+ </transf>
  </goal>
 </theory>
 <theory name="Function_sysfs_streq_behaviors" sum="19a4eb0b73cc252b1b6d5cdbe0ec1fd4" expanded="true">
@@ -26,18 +297,18 @@
   <proof prover="0"><result status="valid" time="0.01" steps="12"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.5" expl="loop invariant init">
-  <proof prover="0"><result status="valid" time="0.31" steps="1919"/></proof>
+  <proof prover="0"><result status="valid" time="0.36" steps="1919"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.6" expl="loop invariant preservation" expanded="true">
   <transf name="split_goal_wp" expanded="true">
    <goal name="WP_parameter sysfs_streq_ensures_default.6.1" expl="Function sysfs_streq, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="62"/></proof>
+   <proof prover="0"><result status="valid" time="0.03" steps="62"/></proof>
    </goal>
    <goal name="WP_parameter sysfs_streq_ensures_default.6.2" expl="Function sysfs_streq, default behavior">
-   <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
+   <proof prover="0"><result status="valid" time="0.03" steps="64"/></proof>
    </goal>
    <goal name="WP_parameter sysfs_streq_ensures_default.6.3" expl="Function sysfs_streq, default behavior">
-   <proof prover="0"><result status="valid" time="0.09" steps="292"/></proof>
+   <proof prover="0"><result status="valid" time="0.10" steps="292"/></proof>
    </goal>
    <goal name="WP_parameter sysfs_streq_ensures_default.6.4" expl="Function sysfs_streq, default behavior">
    <proof prover="0"><result status="valid" time="0.10" steps="292"/></proof>
@@ -46,10 +317,10 @@
    <proof prover="0"><result status="valid" time="0.03" steps="70"/></proof>
    </goal>
    <goal name="WP_parameter sysfs_streq_ensures_default.6.6" expl="Function sysfs_streq, default behavior">
-   <proof prover="0"><result status="valid" time="0.03" steps="72"/></proof>
+   <proof prover="0"><result status="valid" time="0.04" steps="72"/></proof>
    </goal>
    <goal name="WP_parameter sysfs_streq_ensures_default.6.7" expl="Function sysfs_streq, default behavior">
-   <proof prover="0"><result status="valid" time="0.21" steps="728"/></proof>
+   <proof prover="0"><result status="valid" time="0.25" steps="728"/></proof>
    </goal>
    <goal name="WP_parameter sysfs_streq_ensures_default.6.8" expl="Function sysfs_streq, default behavior" expanded="true">
    <transf name="remove_triggers" expanded="true">
@@ -59,8 +330,8 @@
      <transf name="eliminate_if" expanded="true">
       <goal name="WP_parameter sysfs_streq_ensures_default.6.8.1.1.1" expl="Function sysfs_streq, default behavior" expanded="true">
       <transf name="inline_all" expanded="true">
-       <goal name="WP_parameter sysfs_streq_ensures_default.6.8.1.1.1.1" expl="Function sysfs_streq, default behavior">
-       <proof prover="0" timelimit="10" memlimit="8000"><result status="valid" time="6.01" steps="8345"/></proof>
+       <goal name="WP_parameter sysfs_streq_ensures_default.6.8.1.1.1.1" expl="Function sysfs_streq, default behavior" expanded="true">
+       <proof prover="0" timelimit="10" memlimit="8000"><result status="valid" time="6.73" steps="8345"/></proof>
        </goal>
       </transf>
       </goal>
@@ -73,7 +344,7 @@
   </transf>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.7" expl="Assertion in line 26">
-  <proof prover="0"><result status="valid" time="0.13" steps="726"/></proof>
+  <proof prover="0"><result status="valid" time="0.15" steps="726"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.8" expl="Assertion in line 33">
   <proof prover="0"><result status="valid" time="0.02" steps="53"/></proof>
@@ -85,25 +356,25 @@
   <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.11" expl="Assertion in line 39">
-  <proof prover="0"><result status="valid" time="0.02" steps="72"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="72"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.12" expl="Assertion in line 40">
   <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.13" expl="Assertion in line 41">
-  <proof prover="0"><result status="valid" time="0.02" steps="76"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="76"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.14" expl="Assertion in line 42">
   <proof prover="0"><result status="valid" time="0.03" steps="78"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.15" expl="Assertion in line 46">
-  <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.16" expl="Assertion in line 47">
-  <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.17" expl="Assertion in line 48">
-  <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.18" expl="Assertion in line 49">
   <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
@@ -112,28 +383,28 @@
   <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.20" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.21" expl="Assertion in line 54">
-  <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.22" expl="Assertion in line 55">
-  <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.23" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.24" expl="Assertion in line 54">
   <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.25" expl="Assertion in line 55">
-  <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.26" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.02" steps="80"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="80"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.27" expl="Assertion in line 54">
-  <proof prover="0"><result status="valid" time="0.02" steps="81"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="81"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.28" expl="Assertion in line 55">
   <proof prover="0"><result status="valid" time="0.01" steps="76"/></proof>
@@ -142,28 +413,28 @@
   <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.30" expl="Assertion in line 47">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.31" expl="Assertion in line 48">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.32" expl="Assertion in line 49">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.33" expl="Assertion in line 50">
   <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.34" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.35" expl="Assertion in line 54">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.36" expl="Assertion in line 55">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.37" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.38" expl="Assertion in line 54">
   <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
@@ -172,31 +443,31 @@
   <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.40" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="74"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.41" expl="Assertion in line 54">
-  <proof prover="0"><result status="valid" time="0.02" steps="75"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="75"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.42" expl="Assertion in line 55">
-  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="74"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.43" expl="Assertion in line 46">
-  <proof prover="1"><result status="valid" time="0.07"/></proof>
+  <proof prover="2"><result status="valid" time="0.09"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.44" expl="Assertion in line 47">
-  <proof prover="0"><result status="valid" time="1.06" steps="2674"/></proof>
+  <proof prover="0"><result status="valid" time="1.17" steps="2674"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.45" expl="Assertion in line 48">
   <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.46" expl="Assertion in line 49">
-  <proof prover="0"><result status="valid" time="0.02" steps="80"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="80"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.47" expl="Assertion in line 50">
-  <proof prover="0"><result status="valid" time="0.99" steps="2091"/></proof>
+  <proof prover="0"><result status="valid" time="1.15" steps="2091"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.48" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.02" steps="78"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="78"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.49" expl="Assertion in line 54">
   <proof prover="0"><result status="valid" time="0.02" steps="79"/></proof>
@@ -208,43 +479,43 @@
   <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.52" expl="Assertion in line 54">
-  <proof prover="0"><result status="valid" time="0.02" steps="75"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="75"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.53" expl="Assertion in line 55">
-  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="74"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.54" expl="Assertion in line 53">
   <proof prover="0"><result status="valid" time="0.02" steps="68"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.55" expl="Assertion in line 54">
-  <proof prover="0"><result status="valid" time="0.08" steps="262"/></proof>
+  <proof prover="0"><result status="valid" time="0.11" steps="262"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.56" expl="Assertion in line 55">
   <proof prover="0"><result status="valid" time="0.02" steps="68"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.57" expl="Assertion in line 26">
-  <proof prover="0"><result status="valid" time="0.14" steps="676"/></proof>
+  <proof prover="0"><result status="valid" time="0.15" steps="676"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.58" expl="Assertion in line 33">
   <proof prover="0"><result status="valid" time="0.02" steps="81"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.59" expl="Assertion in line 34">
-  <proof prover="0"><result status="valid" time="0.72" steps="1605"/></proof>
+  <proof prover="0"><result status="valid" time="0.81" steps="1605"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.60" expl="Assertion in line 38">
-  <proof prover="1"><result status="valid" time="0.07"/></proof>
+  <proof prover="2"><result status="valid" time="0.08"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.61" expl="Assertion in line 39">
-  <proof prover="0"><result status="valid" time="1.07" steps="2704"/></proof>
+  <proof prover="0"><result status="valid" time="1.24" steps="2704"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.62" expl="Assertion in line 40">
   <proof prover="0"><result status="valid" time="0.02" steps="68"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.63" expl="Assertion in line 41">
-  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.04" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.64" expl="Assertion in line 42">
-  <proof prover="0"><result status="valid" time="1.05" steps="2114"/></proof>
+  <proof prover="0"><result status="valid" time="1.21" steps="2114"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.65" expl="Assertion in line 46">
   <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
@@ -256,37 +527,37 @@
   <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.68" expl="Assertion in line 49">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.69" expl="Assertion in line 50">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.70" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.71" expl="Assertion in line 54">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.72" expl="Assertion in line 55">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.73" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.74" expl="Assertion in line 54">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.75" expl="Assertion in line 55">
-  <proof prover="0"><result status="valid" time="0.01" steps="64"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="64"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.76" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="74"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.77" expl="Assertion in line 54">
   <proof prover="0"><result status="valid" time="0.02" steps="75"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.78" expl="Assertion in line 55">
-  <proof prover="0"><result status="valid" time="0.01" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.79" expl="Assertion in line 46">
   <proof prover="0"><result status="valid" time="0.01" steps="58"/></proof>
@@ -322,7 +593,7 @@
   <proof prover="0"><result status="valid" time="0.01" steps="58"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.90" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.08" steps="255"/></proof>
+  <proof prover="0"><result status="valid" time="0.09" steps="255"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.91" expl="Assertion in line 54">
   <proof prover="0"><result status="valid" time="0.02" steps="69"/></proof>
@@ -340,10 +611,10 @@
   <proof prover="0"><result status="valid" time="0.01" steps="52"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.96" expl="Assertion in line 49">
-  <proof prover="0"><result status="valid" time="0.01" steps="52"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="52"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.97" expl="Assertion in line 50">
-  <proof prover="0"><result status="valid" time="0.01" steps="52"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="52"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.98" expl="Assertion in line 53">
   <proof prover="0"><result status="valid" time="0.01" steps="52"/></proof>
@@ -364,7 +635,7 @@
   <proof prover="0"><result status="valid" time="0.01" steps="52"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.104" expl="Assertion in line 53">
-  <proof prover="0"><result status="valid" time="0.02" steps="62"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="62"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_default.105" expl="Assertion in line 54">
   <proof prover="0"><result status="valid" time="0.02" steps="63"/></proof>
@@ -377,25 +648,25 @@
  <goal name="WP_parameter sysfs_streq_ensures_not_trivial" expl="Function sysfs_streq, behavior not_trivial" expanded="true">
  <transf name="split_goal_wp" expanded="true">
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.1" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.02" steps="70"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="70"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.2" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.02" steps="90"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="90"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.3" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.01" steps="74"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.4" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.01" steps="74"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.5" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.01" steps="74"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="74"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.6" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.03" steps="89"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="89"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.7" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.01" steps="68"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="68"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.8" expl="Ensures clause (Postcondition)">
   <proof prover="0"><result status="valid" time="0.01" steps="68"/></proof>
@@ -404,25 +675,25 @@
   <proof prover="0"><result status="valid" time="0.01" steps="68"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.10" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.02" steps="83"/></proof>
+  <proof prover="0"><result status="valid" time="0.03" steps="83"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.11" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.85" steps="5711"/></proof>
+  <proof prover="0"><result status="valid" time="0.97" steps="5711"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.12" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.40"/></proof>
+  <proof prover="2"><result status="valid" time="0.55"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.13" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.44"/></proof>
+  <proof prover="2"><result status="valid" time="0.63"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.14" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.44"/></proof>
+  <proof prover="2"><result status="valid" time="0.67"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.15" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.80" steps="2177"/></proof>
+  <proof prover="0"><result status="valid" time="0.90" steps="2177"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.16" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.68" steps="3298"/></proof>
+  <proof prover="0"><result status="valid" time="0.76" steps="3297"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.17" expl="Ensures clause (Postcondition)">
   <proof prover="0"><result status="valid" time="0.01" steps="68"/></proof>
@@ -431,10 +702,10 @@
   <proof prover="0"><result status="valid" time="0.01" steps="68"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.19" expl="Ensures clause (Postcondition)">
-  <proof prover="0"><result status="valid" time="0.01" steps="68"/></proof>
+  <proof prover="0"><result status="valid" time="0.02" steps="68"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.20" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.46"/></proof>
+  <proof prover="2"><result status="valid" time="0.69"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.21" expl="Ensures clause (Postcondition)">
   <proof prover="0"><result status="valid" time="0.01" steps="62"/></proof>
@@ -446,7 +717,7 @@
   <proof prover="0"><result status="valid" time="0.01" steps="62"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.24" expl="Ensures clause (Postcondition)">
-  <proof prover="1"><result status="valid" time="0.51"/></proof>
+  <proof prover="2"><result status="valid" time="0.68"/></proof>
   </goal>
   <goal name="WP_parameter sysfs_streq_ensures_not_trivial.25" expl="Ensures clause (Postcondition)">
   <proof prover="0"><result status="valid" time="0.01" steps="56"/></proof>
@@ -463,10 +734,10 @@
  </transf>
  </goal>
  <goal name="WP_parameter sysfs_streq_ensures_nulls" expl="Function sysfs_streq, behavior nulls" expanded="true">
- <proof prover="1"><result status="valid" time="0.67"/></proof>
+ <proof prover="2"><result status="valid" time="1.14"/></proof>
  </goal>
  <goal name="WP_parameter sysfs_streq_ensures_trivial" expl="Function sysfs_streq, behavior trivial" expanded="true">
- <proof prover="1"><result status="valid" time="0.46"/></proof>
+ <proof prover="2"><result status="valid" time="0.72"/></proof>
  </goal>
 </theory>
 <theory name="Axiomatic_Padding" sum="d41d8cd98f00b204e9800998ecf8427e" expanded="true">