Merge branch 'main' into son/loops2

36 files changed, 577 insertions, 2090 deletions

diff --git a/tests/fstar/arrays/Arrays.Clauses.Template.fst b/tests/fstar/arrays/Arrays.Clauses.Template.fst
index e695b89b..914ef44e 100644
--- a/tests/fstar/arrays/Arrays.Clauses.Template.fst
+++ b/tests/fstar/arrays/Arrays.Clauses.Template.fst
@@ -7,31 +7,31 @@ open Arrays.Types
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [arrays::sum]: decreases clause
-    Source: 'tests/src/arrays.rs', lines 242:0-250:1 *)
+    Source: 'tests/src/arrays.rs', lines 245:0-253:1 *)
 unfold
 let sum_loop_decreases (s : slice u32) (sum1 : u32) (i : usize) : nat =
   admit ()
 
 (** [arrays::sum2]: decreases clause
-    Source: 'tests/src/arrays.rs', lines 252:0-261:1 *)
+    Source: 'tests/src/arrays.rs', lines 255:0-264:1 *)
 unfold
 let sum2_loop_decreases (s : slice u32) (s2 : slice u32) (sum1 : u32)
   (i : usize) : nat =
   admit ()
 
 (** [arrays::zero_slice]: decreases clause
-    Source: 'tests/src/arrays.rs', lines 303:0-310:1 *)
+    Source: 'tests/src/arrays.rs', lines 306:0-313:1 *)
 unfold
 let zero_slice_loop_decreases (a : slice u8) (i : usize) (len : usize) : nat =
   admit ()
 
 (** [arrays::iter_mut_slice]: decreases clause
-    Source: 'tests/src/arrays.rs', lines 312:0-318:1 *)
+    Source: 'tests/src/arrays.rs', lines 315:0-321:1 *)
 unfold
 let iter_mut_slice_loop_decreases (len : usize) (i : usize) : nat = admit ()
 
 (** [arrays::sum_mut_slice]: decreases clause
-    Source: 'tests/src/arrays.rs', lines 320:0-328:1 *)
+    Source: 'tests/src/arrays.rs', lines 323:0-331:1 *)
 unfold
 let sum_mut_slice_loop_decreases (a : slice u32) (i : usize) (s : u32) : nat =
   admit ()
diff --git a/tests/fstar/arrays/Arrays.Funs.fst b/tests/fstar/arrays/Arrays.Funs.fst
index 6196e3b7..26a695bb 100644
--- a/tests/fstar/arrays/Arrays.Funs.fst
+++ b/tests/fstar/arrays/Arrays.Funs.fst
@@ -8,17 +8,17 @@ include Arrays.Clauses
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [arrays::incr]:
-    Source: 'tests/src/arrays.rs', lines 8:0-8:24 *)
+    Source: 'tests/src/arrays.rs', lines 11:0-11:24 *)
 let incr (x : u32) : result u32 =
   u32_add x 1
 
 (** [arrays::array_to_shared_slice_]:
-    Source: 'tests/src/arrays.rs', lines 16:0-16:53 *)
+    Source: 'tests/src/arrays.rs', lines 19:0-19:53 *)
 let array_to_shared_slice_ (t : Type0) (s : array t 32) : result (slice t) =
   array_to_slice t 32 s
 
 (** [arrays::array_to_mut_slice_]:
-    Source: 'tests/src/arrays.rs', lines 21:0-21:58 *)
+    Source: 'tests/src/arrays.rs', lines 24:0-24:58 *)
 let array_to_mut_slice_
   (t : Type0) (s : array t 32) :
   result ((slice t) & (slice t -> result (array t 32)))
@@ -26,37 +26,37 @@ let array_to_mut_slice_
   array_to_slice_mut t 32 s
 
 (** [arrays::array_len]:
-    Source: 'tests/src/arrays.rs', lines 25:0-25:40 *)
+    Source: 'tests/src/arrays.rs', lines 28:0-28:40 *)
 let array_len (t : Type0) (s : array t 32) : result usize =
   let* s1 = array_to_slice t 32 s in Ok (slice_len t s1)
 
 (** [arrays::shared_array_len]:
-    Source: 'tests/src/arrays.rs', lines 29:0-29:48 *)
+    Source: 'tests/src/arrays.rs', lines 32:0-32:48 *)
 let shared_array_len (t : Type0) (s : array t 32) : result usize =
   let* s1 = array_to_slice t 32 s in Ok (slice_len t s1)
 
 (** [arrays::shared_slice_len]:
-    Source: 'tests/src/arrays.rs', lines 33:0-33:44 *)
+    Source: 'tests/src/arrays.rs', lines 36:0-36:44 *)
 let shared_slice_len (t : Type0) (s : slice t) : result usize =
   Ok (slice_len t s)
 
 (** [arrays::index_array_shared]:
-    Source: 'tests/src/arrays.rs', lines 37:0-37:57 *)
+    Source: 'tests/src/arrays.rs', lines 40:0-40:57 *)
 let index_array_shared (t : Type0) (s : array t 32) (i : usize) : result t =
   array_index_usize t 32 s i
 
 (** [arrays::index_array_u32]:
-    Source: 'tests/src/arrays.rs', lines 44:0-44:53 *)
+    Source: 'tests/src/arrays.rs', lines 47:0-47:53 *)
 let index_array_u32 (s : array u32 32) (i : usize) : result u32 =
   array_index_usize u32 32 s i
 
 (** [arrays::index_array_copy]:
-    Source: 'tests/src/arrays.rs', lines 48:0-48:45 *)
+    Source: 'tests/src/arrays.rs', lines 51:0-51:45 *)
 let index_array_copy (x : array u32 32) : result u32 =
   array_index_usize u32 32 x 0
 
 (** [arrays::index_mut_array]:
-    Source: 'tests/src/arrays.rs', lines 52:0-52:62 *)
+    Source: 'tests/src/arrays.rs', lines 55:0-55:62 *)
 let index_mut_array
   (t : Type0) (s : array t 32) (i : usize) :
   result (t & (t -> result (array t 32)))
@@ -64,12 +64,12 @@ let index_mut_array
   array_index_mut_usize t 32 s i
 
 (** [arrays::index_slice]:
-    Source: 'tests/src/arrays.rs', lines 56:0-56:46 *)
+    Source: 'tests/src/arrays.rs', lines 59:0-59:46 *)
 let index_slice (t : Type0) (s : slice t) (i : usize) : result t =
   slice_index_usize t s i
 
 (** [arrays::index_mut_slice]:
-    Source: 'tests/src/arrays.rs', lines 60:0-60:58 *)
+    Source: 'tests/src/arrays.rs', lines 63:0-63:58 *)
 let index_mut_slice
   (t : Type0) (s : slice t) (i : usize) :
   result (t & (t -> result (slice t)))
@@ -77,7 +77,7 @@ let index_mut_slice
   slice_index_mut_usize t s i
 
 (** [arrays::slice_subslice_shared_]:
-    Source: 'tests/src/arrays.rs', lines 64:0-64:70 *)
+    Source: 'tests/src/arrays.rs', lines 67:0-67:70 *)
 let slice_subslice_shared_
   (x : slice u32) (y : usize) (z : usize) : result (slice u32) =
   core_slice_index_Slice_index u32 (core_ops_range_Range usize)
@@ -85,7 +85,7 @@ let slice_subslice_shared_
     { start = y; end_ = z }
 
 (** [arrays::slice_subslice_mut_]:
-    Source: 'tests/src/arrays.rs', lines 68:0-68:75 *)
+    Source: 'tests/src/arrays.rs', lines 71:0-71:75 *)
 let slice_subslice_mut_
   (x : slice u32) (y : usize) (z : usize) :
   result ((slice u32) & (slice u32 -> result (slice u32)))
@@ -97,12 +97,12 @@ let slice_subslice_mut_
   Ok (s, index_mut_back)
 
 (** [arrays::array_to_slice_shared_]:
-    Source: 'tests/src/arrays.rs', lines 72:0-72:54 *)
+    Source: 'tests/src/arrays.rs', lines 75:0-75:54 *)
 let array_to_slice_shared_ (x : array u32 32) : result (slice u32) =
   array_to_slice u32 32 x
 
 (** [arrays::array_to_slice_mut_]:
-    Source: 'tests/src/arrays.rs', lines 76:0-76:59 *)
+    Source: 'tests/src/arrays.rs', lines 79:0-79:59 *)
 let array_to_slice_mut_
   (x : array u32 32) :
   result ((slice u32) & (slice u32 -> result (array u32 32)))
@@ -110,7 +110,7 @@ let array_to_slice_mut_
   array_to_slice_mut u32 32 x
 
 (** [arrays::array_subslice_shared_]:
-    Source: 'tests/src/arrays.rs', lines 80:0-80:74 *)
+    Source: 'tests/src/arrays.rs', lines 83:0-83:74 *)
 let array_subslice_shared_
   (x : array u32 32) (y : usize) (z : usize) : result (slice u32) =
   core_array_Array_index u32 (core_ops_range_Range usize) 32
@@ -119,7 +119,7 @@ let array_subslice_shared_
     { start = y; end_ = z }
 
 (** [arrays::array_subslice_mut_]:
-    Source: 'tests/src/arrays.rs', lines 84:0-84:79 *)
+    Source: 'tests/src/arrays.rs', lines 87:0-87:79 *)
 let array_subslice_mut_
   (x : array u32 32) (y : usize) (z : usize) :
   result ((slice u32) & (slice u32 -> result (array u32 32)))
@@ -132,24 +132,24 @@ let array_subslice_mut_
   Ok (s, index_mut_back)
 
 (** [arrays::index_slice_0]:
-    Source: 'tests/src/arrays.rs', lines 88:0-88:38 *)
+    Source: 'tests/src/arrays.rs', lines 91:0-91:38 *)
 let index_slice_0 (t : Type0) (s : slice t) : result t =
   slice_index_usize t s 0
 
 (** [arrays::index_array_0]:
-    Source: 'tests/src/arrays.rs', lines 92:0-92:42 *)
+    Source: 'tests/src/arrays.rs', lines 95:0-95:42 *)
 let index_array_0 (t : Type0) (s : array t 32) : result t =
   array_index_usize t 32 s 0
 
 (** [arrays::index_index_array]:
-    Source: 'tests/src/arrays.rs', lines 103:0-103:71 *)
+    Source: 'tests/src/arrays.rs', lines 106:0-106:71 *)
 let index_index_array
   (s : array (array u32 32) 32) (i : usize) (j : usize) : result u32 =
   let* a = array_index_usize (array u32 32) 32 s i in
   array_index_usize u32 32 a j
 
 (** [arrays::update_update_array]:
-    Source: 'tests/src/arrays.rs', lines 114:0-114:70 *)
+    Source: 'tests/src/arrays.rs', lines 117:0-117:70 *)
 let update_update_array
   (s : array (array u32 32) 32) (i : usize) (j : usize) : result unit =
   let* (a, index_mut_back) = array_index_mut_usize (array u32 32) 32 s i in
@@ -159,42 +159,42 @@ let update_update_array
   Ok ()
 
 (** [arrays::array_local_deep_copy]:
-    Source: 'tests/src/arrays.rs', lines 118:0-118:43 *)
+    Source: 'tests/src/arrays.rs', lines 121:0-121:43 *)
 let array_local_deep_copy (x : array u32 32) : result unit =
   Ok ()
 
 (** [arrays::take_array]:
-    Source: 'tests/src/arrays.rs', lines 122:0-122:30 *)
+    Source: 'tests/src/arrays.rs', lines 125:0-125:30 *)
 let take_array (a : array u32 2) : result unit =
   Ok ()
 
 (** [arrays::take_array_borrow]:
-    Source: 'tests/src/arrays.rs', lines 123:0-123:38 *)
+    Source: 'tests/src/arrays.rs', lines 126:0-126:38 *)
 let take_array_borrow (a : array u32 2) : result unit =
   Ok ()
 
 (** [arrays::take_slice]:
-    Source: 'tests/src/arrays.rs', lines 124:0-124:28 *)
+    Source: 'tests/src/arrays.rs', lines 127:0-127:28 *)
 let take_slice (s : slice u32) : result unit =
   Ok ()
 
 (** [arrays::take_mut_slice]:
-    Source: 'tests/src/arrays.rs', lines 125:0-125:36 *)
+    Source: 'tests/src/arrays.rs', lines 128:0-128:36 *)
 let take_mut_slice (s : slice u32) : result (slice u32) =
   Ok s
 
 (** [arrays::const_array]:
-    Source: 'tests/src/arrays.rs', lines 127:0-127:32 *)
+    Source: 'tests/src/arrays.rs', lines 130:0-130:32 *)
 let const_array : result (array u32 2) =
   Ok (mk_array u32 2 [ 0; 0 ])
 
 (** [arrays::const_slice]:
-    Source: 'tests/src/arrays.rs', lines 131:0-131:20 *)
+    Source: 'tests/src/arrays.rs', lines 134:0-134:20 *)
 let const_slice : result unit =
   let* _ = array_to_slice u32 2 (mk_array u32 2 [ 0; 0 ]) in Ok ()
 
 (** [arrays::take_all]:
-    Source: 'tests/src/arrays.rs', lines 141:0-141:17 *)
+    Source: 'tests/src/arrays.rs', lines 144:0-144:17 *)
 let take_all : result unit =
   let* _ = take_array (mk_array u32 2 [ 0; 0 ]) in
   let* _ = take_array (mk_array u32 2 [ 0; 0 ]) in
@@ -208,27 +208,27 @@ let take_all : result unit =
   Ok ()
 
 (** [arrays::index_array]:
-    Source: 'tests/src/arrays.rs', lines 155:0-155:38 *)
+    Source: 'tests/src/arrays.rs', lines 158:0-158:38 *)
 let index_array (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
 (** [arrays::index_array_borrow]:
-    Source: 'tests/src/arrays.rs', lines 158:0-158:46 *)
+    Source: 'tests/src/arrays.rs', lines 161:0-161:46 *)
 let index_array_borrow (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
 (** [arrays::index_slice_u32_0]:
-    Source: 'tests/src/arrays.rs', lines 162:0-162:42 *)
+    Source: 'tests/src/arrays.rs', lines 165:0-165:42 *)
 let index_slice_u32_0 (x : slice u32) : result u32 =
   slice_index_usize u32 x 0
 
 (** [arrays::index_mut_slice_u32_0]:
-    Source: 'tests/src/arrays.rs', lines 166:0-166:50 *)
+    Source: 'tests/src/arrays.rs', lines 169:0-169:50 *)
 let index_mut_slice_u32_0 (x : slice u32) : result (u32 & (slice u32)) =
   let* i = slice_index_usize u32 x 0 in Ok (i, x)
 
 (** [arrays::index_all]:
-    Source: 'tests/src/arrays.rs', lines 170:0-170:25 *)
+    Source: 'tests/src/arrays.rs', lines 173:0-173:25 *)
 let index_all : result u32 =
   let* i = index_array (mk_array u32 2 [ 0; 0 ]) in
   let* i1 = index_array (mk_array u32 2 [ 0; 0 ]) in
@@ -241,30 +241,30 @@ let index_all : result u32 =
   let* (s1, to_slice_mut_back) =
     array_to_slice_mut u32 2 (mk_array u32 2 [ 0; 0 ]) in
   let* (i7, s2) = index_mut_slice_u32_0 s1 in
-  let* i8 = u32_add i6 i7 in
+  let* i9 = u32_add i6 i7 in
   let* _ = to_slice_mut_back s2 in
-  Ok i8
+  Ok i9
 
 (** [arrays::update_array]:
-    Source: 'tests/src/arrays.rs', lines 184:0-184:36 *)
+    Source: 'tests/src/arrays.rs', lines 187:0-187:36 *)
 let update_array (x : array u32 2) : result unit =
   let* (_, index_mut_back) = array_index_mut_usize u32 2 x 0 in
   let* _ = index_mut_back 1 in
   Ok ()
 
 (** [arrays::update_array_mut_borrow]:
-    Source: 'tests/src/arrays.rs', lines 187:0-187:48 *)
+    Source: 'tests/src/arrays.rs', lines 190:0-190:48 *)
 let update_array_mut_borrow (x : array u32 2) : result (array u32 2) =
   let* (_, index_mut_back) = array_index_mut_usize u32 2 x 0 in
   index_mut_back 1
 
 (** [arrays::update_mut_slice]:
-    Source: 'tests/src/arrays.rs', lines 190:0-190:38 *)
+    Source: 'tests/src/arrays.rs', lines 193:0-193:38 *)
 let update_mut_slice (x : slice u32) : result (slice u32) =
   let* (_, index_mut_back) = slice_index_mut_usize u32 x 0 in index_mut_back 1
 
 (** [arrays::update_all]:
-    Source: 'tests/src/arrays.rs', lines 194:0-194:19 *)
+    Source: 'tests/src/arrays.rs', lines 197:0-197:19 *)
 let update_all : result unit =
   let* _ = update_array (mk_array u32 2 [ 0; 0 ]) in
   let* _ = update_array (mk_array u32 2 [ 0; 0 ]) in
@@ -275,7 +275,7 @@ let update_all : result unit =
   Ok ()
 
 (** [arrays::range_all]:
-    Source: 'tests/src/arrays.rs', lines 205:0-205:18 *)
+    Source: 'tests/src/arrays.rs', lines 208:0-208:18 *)
 let range_all : result unit =
   let* (s, index_mut_back) =
     core_array_Array_index_mut u32 (core_ops_range_Range usize) 4
@@ -287,27 +287,27 @@ let range_all : result unit =
   Ok ()
 
 (** [arrays::deref_array_borrow]:
-    Source: 'tests/src/arrays.rs', lines 214:0-214:46 *)
+    Source: 'tests/src/arrays.rs', lines 217:0-217:46 *)
 let deref_array_borrow (x : array u32 2) : result u32 =
   array_index_usize u32 2 x 0
 
 (** [arrays::deref_array_mut_borrow]:
-    Source: 'tests/src/arrays.rs', lines 219:0-219:54 *)
+    Source: 'tests/src/arrays.rs', lines 222:0-222:54 *)
 let deref_array_mut_borrow (x : array u32 2) : result (u32 & (array u32 2)) =
   let* i = array_index_usize u32 2 x 0 in Ok (i, x)
 
 (** [arrays::take_array_t]:
-    Source: 'tests/src/arrays.rs', lines 227:0-227:31 *)
+    Source: 'tests/src/arrays.rs', lines 230:0-230:31 *)
 let take_array_t (a : array aB_t 2) : result unit =
   Ok ()
 
 (** [arrays::non_copyable_array]:
-    Source: 'tests/src/arrays.rs', lines 229:0-229:27 *)
+    Source: 'tests/src/arrays.rs', lines 232:0-232:27 *)
 let non_copyable_array : result unit =
   take_array_t (mk_array aB_t 2 [ AB_A; AB_B ])
 
 (** [arrays::sum]: loop 0:
-    Source: 'tests/src/arrays.rs', lines 242:0-250:1 *)
+    Source: 'tests/src/arrays.rs', lines 245:0-253:1 *)
 let rec sum_loop
   (s : slice u32) (sum1 : u32) (i : usize) :
   Tot (result u32) (decreases (sum_loop_decreases s sum1 i))
@@ -322,12 +322,12 @@ let rec sum_loop
   else Ok sum1
 
 (** [arrays::sum]:
-    Source: 'tests/src/arrays.rs', lines 242:0-242:28 *)
+    Source: 'tests/src/arrays.rs', lines 245:0-245:28 *)
 let sum (s : slice u32) : result u32 =
   sum_loop s 0 0
 
 (** [arrays::sum2]: loop 0:
-    Source: 'tests/src/arrays.rs', lines 252:0-261:1 *)
+    Source: 'tests/src/arrays.rs', lines 255:0-264:1 *)
 let rec sum2_loop
   (s : slice u32) (s2 : slice u32) (sum1 : u32) (i : usize) :
   Tot (result u32) (decreases (sum2_loop_decreases s s2 sum1 i))
@@ -344,14 +344,14 @@ let rec sum2_loop
   else Ok sum1
 
 (** [arrays::sum2]:
-    Source: 'tests/src/arrays.rs', lines 252:0-252:41 *)
+    Source: 'tests/src/arrays.rs', lines 255:0-255:41 *)
 let sum2 (s : slice u32) (s2 : slice u32) : result u32 =
   let i = slice_len u32 s in
   let i1 = slice_len u32 s2 in
   if not (i = i1) then Fail Failure else sum2_loop s s2 0 0
 
 (** [arrays::f0]:
-    Source: 'tests/src/arrays.rs', lines 263:0-263:11 *)
+    Source: 'tests/src/arrays.rs', lines 266:0-266:11 *)
 let f0 : result unit =
   let* (s, to_slice_mut_back) =
     array_to_slice_mut u32 2 (mk_array u32 2 [ 1; 2 ]) in
@@ -361,7 +361,7 @@ let f0 : result unit =
   Ok ()
 
 (** [arrays::f1]:
-    Source: 'tests/src/arrays.rs', lines 268:0-268:11 *)
+    Source: 'tests/src/arrays.rs', lines 271:0-271:11 *)
 let f1 : result unit =
   let* (_, index_mut_back) =
     array_index_mut_usize u32 2 (mk_array u32 2 [ 1; 2 ]) 0 in
@@ -369,12 +369,12 @@ let f1 : result unit =
   Ok ()
 
 (** [arrays::f2]:
-    Source: 'tests/src/arrays.rs', lines 273:0-273:17 *)
+    Source: 'tests/src/arrays.rs', lines 276:0-276:17 *)
 let f2 (i : u32) : result unit =
   Ok ()
 
 (** [arrays::f4]:
-    Source: 'tests/src/arrays.rs', lines 282:0-282:54 *)
+    Source: 'tests/src/arrays.rs', lines 285:0-285:54 *)
 let f4 (x : array u32 32) (y : usize) (z : usize) : result (slice u32) =
   core_array_Array_index u32 (core_ops_range_Range usize) 32
     (core_ops_index_IndexSliceTIInst u32 (core_ops_range_Range usize)
@@ -382,7 +382,7 @@ let f4 (x : array u32 32) (y : usize) (z : usize) : result (slice u32) =
     { start = y; end_ = z }
 
 (** [arrays::f3]:
-    Source: 'tests/src/arrays.rs', lines 275:0-275:18 *)
+    Source: 'tests/src/arrays.rs', lines 278:0-278:18 *)
 let f3 : result u32 =
   let* i = array_index_usize u32 2 (mk_array u32 2 [ 1; 2 ]) 0 in
   let* _ = f2 i in
@@ -392,17 +392,17 @@ let f3 : result u32 =
   sum2 s s1
 
 (** [arrays::SZ]
-    Source: 'tests/src/arrays.rs', lines 286:0-286:19 *)
+    Source: 'tests/src/arrays.rs', lines 289:0-289:19 *)
 let sz_body : result usize = Ok 32
 let sz : usize = eval_global sz_body
 
 (** [arrays::f5]:
-    Source: 'tests/src/arrays.rs', lines 289:0-289:31 *)
+    Source: 'tests/src/arrays.rs', lines 292:0-292:31 *)
 let f5 (x : array u32 32) : result u32 =
   array_index_usize u32 32 x 0
 
 (** [arrays::ite]:
-    Source: 'tests/src/arrays.rs', lines 294:0-294:12 *)
+    Source: 'tests/src/arrays.rs', lines 297:0-297:12 *)
 let ite : result unit =
   let* (s, to_slice_mut_back) =
     array_to_slice_mut u32 2 (mk_array u32 2 [ 0; 0 ]) in
@@ -415,7 +415,7 @@ let ite : result unit =
   Ok ()
 
 (** [arrays::zero_slice]: loop 0:
-    Source: 'tests/src/arrays.rs', lines 303:0-310:1 *)
+    Source: 'tests/src/arrays.rs', lines 306:0-313:1 *)
 let rec zero_slice_loop
   (a : slice u8) (i : usize) (len : usize) :
   Tot (result (slice u8)) (decreases (zero_slice_loop_decreases a i len))
@@ -429,12 +429,12 @@ let rec zero_slice_loop
   else Ok a
 
 (** [arrays::zero_slice]:
-    Source: 'tests/src/arrays.rs', lines 303:0-303:31 *)
+    Source: 'tests/src/arrays.rs', lines 306:0-306:31 *)
 let zero_slice (a : slice u8) : result (slice u8) =
   let len = slice_len u8 a in zero_slice_loop a 0 len
 
 (** [arrays::iter_mut_slice]: loop 0:
-    Source: 'tests/src/arrays.rs', lines 312:0-318:1 *)
+    Source: 'tests/src/arrays.rs', lines 315:0-321:1 *)
 let rec iter_mut_slice_loop
   (len : usize) (i : usize) :
   Tot (result unit) (decreases (iter_mut_slice_loop_decreases len i))
@@ -444,12 +444,12 @@ let rec iter_mut_slice_loop
   else Ok ()
 
 (** [arrays::iter_mut_slice]:
-    Source: 'tests/src/arrays.rs', lines 312:0-312:35 *)
+    Source: 'tests/src/arrays.rs', lines 315:0-315:35 *)
 let iter_mut_slice (a : slice u8) : result (slice u8) =
   let len = slice_len u8 a in let* _ = iter_mut_slice_loop len 0 in Ok a
 
 (** [arrays::sum_mut_slice]: loop 0:
-    Source: 'tests/src/arrays.rs', lines 320:0-328:1 *)
+    Source: 'tests/src/arrays.rs', lines 323:0-331:1 *)
 let rec sum_mut_slice_loop
   (a : slice u32) (i : usize) (s : u32) :
   Tot (result u32) (decreases (sum_mut_slice_loop_decreases a i s))
@@ -464,7 +464,7 @@ let rec sum_mut_slice_loop
   else Ok s
 
 (** [arrays::sum_mut_slice]:
-    Source: 'tests/src/arrays.rs', lines 320:0-320:42 *)
+    Source: 'tests/src/arrays.rs', lines 323:0-323:42 *)
 let sum_mut_slice (a : slice u32) : result (u32 & (slice u32)) =
   let* i = sum_mut_slice_loop a 0 0 in Ok (i, a)
 
diff --git a/tests/fstar/arrays/Arrays.Types.fst b/tests/fstar/arrays/Arrays.Types.fst
index be9c224f..41f892ad 100644
--- a/tests/fstar/arrays/Arrays.Types.fst
+++ b/tests/fstar/arrays/Arrays.Types.fst
@@ -6,6 +6,6 @@ open Primitives
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [arrays::AB]
-    Source: 'tests/src/arrays.rs', lines 3:0-3:11 *)
+    Source: 'tests/src/arrays.rs', lines 6:0-6:11 *)
 type aB_t = | AB_A : aB_t | AB_B : aB_t
 
diff --git a/tests/fstar/betree/BetreeMain.Clauses.Template.fst b/tests/fstar/betree/Betree.Clauses.Template.fst
index b317dca4..fad8c5ba 100644
--- a/tests/fstar/betree/BetreeMain.Clauses.Template.fst
+++ b/tests/fstar/betree/Betree.Clauses.Template.fst
@@ -1,46 +1,46 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [betree_main]: templates for the decreases clauses *)
-module BetreeMain.Clauses.Template
+(** [betree]: templates for the decreases clauses *)
+module Betree.Clauses.Template
 open Primitives
-open BetreeMain.Types
+open Betree.Types
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [betree_main::betree::{betree_main::betree::List<T>#1}::len]: decreases clause
+(** [betree::betree::{betree::betree::List<T>#1}::len]: decreases clause
     Source: 'src/betree.rs', lines 276:4-276:24 *)
 unfold
 let betree_List_len_decreases (t : Type0) (self : betree_List_t t) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::List<T>#1}::split_at]: decreases clause
+(** [betree::betree::{betree::betree::List<T>#1}::split_at]: decreases clause
     Source: 'src/betree.rs', lines 284:4-284:51 *)
 unfold
 let betree_List_split_at_decreases (t : Type0) (self : betree_List_t t)
   (n : u64) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::partition_at_pivot]: decreases clause
+(** [betree::betree::{betree::betree::List<(u64, T)>#2}::partition_at_pivot]: decreases clause
     Source: 'src/betree.rs', lines 339:4-339:73 *)
 unfold
 let betree_ListPairU64T_partition_at_pivot_decreases (t : Type0)
   (self : betree_List_t (u64 & t)) (pivot : u64) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_for_key]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_for_key]: decreases clause
     Source: 'src/betree.rs', lines 789:4-792:34 *)
 unfold
 let betree_Node_lookup_first_message_for_key_decreases (key : u64)
   (msgs : betree_List_t (u64 & betree_Message_t)) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::lookup_in_bindings]: decreases clause
     Source: 'src/betree.rs', lines 636:4-636:80 *)
 unfold
 let betree_Node_lookup_in_bindings_decreases (key : u64)
   (bindings : betree_List_t (u64 & u64)) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::apply_upserts]: decreases clause
     Source: 'src/betree.rs', lines 819:4-819:90 *)
 unfold
 let betree_Node_apply_upserts_decreases
@@ -48,35 +48,35 @@ let betree_Node_apply_upserts_decreases
   (key : u64) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]: decreases clause
+(** [betree::betree::{betree::betree::Internal#4}::lookup_in_children]: decreases clause
     Source: 'src/betree.rs', lines 395:4-395:63 *)
 unfold
 let betree_Internal_lookup_in_children_decreases (self : betree_Internal_t)
   (key : u64) (st : state) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::lookup]: decreases clause
     Source: 'src/betree.rs', lines 709:4-709:58 *)
 unfold
 let betree_Node_lookup_decreases (self : betree_Node_t) (key : u64)
   (st : state) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::filter_messages_for_key]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::filter_messages_for_key]: decreases clause
     Source: 'src/betree.rs', lines 674:4-674:77 *)
 unfold
 let betree_Node_filter_messages_for_key_decreases (key : u64)
   (msgs : betree_List_t (u64 & betree_Message_t)) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_after_key]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_after_key]: decreases clause
     Source: 'src/betree.rs', lines 689:4-692:34 *)
 unfold
 let betree_Node_lookup_first_message_after_key_decreases (key : u64)
   (msgs : betree_List_t (u64 & betree_Message_t)) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_internal]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_internal]: decreases clause
     Source: 'src/betree.rs', lines 502:4-505:5 *)
 unfold
 let betree_Node_apply_messages_to_internal_decreases
@@ -84,14 +84,14 @@ let betree_Node_apply_messages_to_internal_decreases
   (new_msgs : betree_List_t (u64 & betree_Message_t)) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_mut_in_bindings]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::lookup_mut_in_bindings]: decreases clause
     Source: 'src/betree.rs', lines 653:4-656:32 *)
 unfold
 let betree_Node_lookup_mut_in_bindings_decreases (key : u64)
   (bindings : betree_List_t (u64 & u64)) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_leaf]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_leaf]: decreases clause
     Source: 'src/betree.rs', lines 444:4-447:5 *)
 unfold
 let betree_Node_apply_messages_to_leaf_decreases
@@ -99,7 +99,7 @@ let betree_Node_apply_messages_to_leaf_decreases
   (new_msgs : betree_List_t (u64 & betree_Message_t)) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Internal#4}::flush]: decreases clause
+(** [betree::betree::{betree::betree::Internal#4}::flush]: decreases clause
     Source: 'src/betree.rs', lines 410:4-415:26 *)
 unfold
 let betree_Internal_flush_decreases (self : betree_Internal_t)
@@ -107,7 +107,7 @@ let betree_Internal_flush_decreases (self : betree_Internal_t)
   (content : betree_List_t (u64 & betree_Message_t)) (st : state) : nat =
   admit ()
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages]: decreases clause
+(** [betree::betree::{betree::betree::Node#5}::apply_messages]: decreases clause
     Source: 'src/betree.rs', lines 588:4-593:5 *)
 unfold
 let betree_Node_apply_messages_decreases (self : betree_Node_t)
diff --git a/tests/fstar/betree/BetreeMain.Clauses.fst b/tests/fstar/betree/Betree.Clauses.fst
index b95d4c7e..ae201cee 100644
--- a/tests/fstar/betree/BetreeMain.Clauses.fst
+++ b/tests/fstar/betree/Betree.Clauses.fst
@@ -1,7 +1,7 @@
 (** [betree_main]: templates for the decreases clauses *)
-module BetreeMain.Clauses
+module Betree.Clauses
 open Primitives
-open BetreeMain.Types
+open Betree.Types
 
 #set-options "--z3rlimit 50 --fuel 0 --ifuel 1"
 
diff --git a/tests/fstar/betree/BetreeMain.Funs.fst b/tests/fstar/betree/Betree.Funs.fst
index 9942ef68..07f561f5 100644
--- a/tests/fstar/betree/BetreeMain.Funs.fst
+++ b/tests/fstar/betree/Betree.Funs.fst
@@ -1,14 +1,14 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [betree_main]: function definitions *)
-module BetreeMain.Funs
+(** [betree]: function definitions *)
+module Betree.Funs
 open Primitives
-include BetreeMain.Types
-include BetreeMain.FunsExternal
-include BetreeMain.Clauses
+include Betree.Types
+include Betree.FunsExternal
+include Betree.Clauses
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [betree_main::betree::load_internal_node]:
+(** [betree::betree::load_internal_node]:
     Source: 'src/betree.rs', lines 36:0-36:52 *)
 let betree_load_internal_node
   (id : u64) (st : state) :
@@ -16,7 +16,7 @@ let betree_load_internal_node
   =
   betree_utils_load_internal_node id st
 
-(** [betree_main::betree::store_internal_node]:
+(** [betree::betree::store_internal_node]:
     Source: 'src/betree.rs', lines 41:0-41:60 *)
 let betree_store_internal_node
   (id : u64) (content : betree_List_t (u64 & betree_Message_t)) (st : state) :
@@ -24,13 +24,13 @@ let betree_store_internal_node
   =
   betree_utils_store_internal_node id content st
 
-(** [betree_main::betree::load_leaf_node]:
+(** [betree::betree::load_leaf_node]:
     Source: 'src/betree.rs', lines 46:0-46:44 *)
 let betree_load_leaf_node
   (id : u64) (st : state) : result (state & (betree_List_t (u64 & u64))) =
   betree_utils_load_leaf_node id st
 
-(** [betree_main::betree::store_leaf_node]:
+(** [betree::betree::store_leaf_node]:
     Source: 'src/betree.rs', lines 51:0-51:52 *)
 let betree_store_leaf_node
   (id : u64) (content : betree_List_t (u64 & u64)) (st : state) :
@@ -38,24 +38,24 @@ let betree_store_leaf_node
   =
   betree_utils_store_leaf_node id content st
 
-(** [betree_main::betree::fresh_node_id]:
+(** [betree::betree::fresh_node_id]:
     Source: 'src/betree.rs', lines 55:0-55:48 *)
 let betree_fresh_node_id (counter : u64) : result (u64 & u64) =
   let* counter1 = u64_add counter 1 in Ok (counter, counter1)
 
-(** [betree_main::betree::{betree_main::betree::NodeIdCounter}::new]:
+(** [betree::betree::{betree::betree::NodeIdCounter}::new]:
     Source: 'src/betree.rs', lines 206:4-206:20 *)
 let betree_NodeIdCounter_new : result betree_NodeIdCounter_t =
   Ok { next_node_id = 0 }
 
-(** [betree_main::betree::{betree_main::betree::NodeIdCounter}::fresh_id]:
+(** [betree::betree::{betree::betree::NodeIdCounter}::fresh_id]:
     Source: 'src/betree.rs', lines 210:4-210:36 *)
 let betree_NodeIdCounter_fresh_id
   (self : betree_NodeIdCounter_t) : result (u64 & betree_NodeIdCounter_t) =
   let* i = u64_add self.next_node_id 1 in
   Ok (self.next_node_id, { next_node_id = i })
 
-(** [betree_main::betree::upsert_update]:
+(** [betree::betree::upsert_update]:
     Source: 'src/betree.rs', lines 234:0-234:70 *)
 let betree_upsert_update
   (prev : option u64) (st : betree_UpsertFunState_t) : result u64 =
@@ -75,7 +75,7 @@ let betree_upsert_update
     end
   end
 
-(** [betree_main::betree::{betree_main::betree::List<T>#1}::len]:
+(** [betree::betree::{betree::betree::List<T>#1}::len]:
     Source: 'src/betree.rs', lines 276:4-276:24 *)
 let rec betree_List_len
   (t : Type0) (self : betree_List_t t) :
@@ -86,7 +86,7 @@ let rec betree_List_len
   | Betree_List_Nil -> Ok 0
   end
 
-(** [betree_main::betree::{betree_main::betree::List<T>#1}::split_at]:
+(** [betree::betree::{betree::betree::List<T>#1}::split_at]:
     Source: 'src/betree.rs', lines 284:4-284:51 *)
 let rec betree_List_split_at
   (t : Type0) (self : betree_List_t t) (n : u64) :
@@ -105,14 +105,14 @@ let rec betree_List_split_at
     | Betree_List_Nil -> Fail Failure
     end
 
-(** [betree_main::betree::{betree_main::betree::List<T>#1}::push_front]:
+(** [betree::betree::{betree::betree::List<T>#1}::push_front]:
     Source: 'src/betree.rs', lines 299:4-299:34 *)
 let betree_List_push_front
   (t : Type0) (self : betree_List_t t) (x : t) : result (betree_List_t t) =
   let (tl, _) = core_mem_replace (betree_List_t t) self Betree_List_Nil in
   Ok (Betree_List_Cons x tl)
 
-(** [betree_main::betree::{betree_main::betree::List<T>#1}::pop_front]:
+(** [betree::betree::{betree::betree::List<T>#1}::pop_front]:
     Source: 'src/betree.rs', lines 306:4-306:32 *)
 let betree_List_pop_front
   (t : Type0) (self : betree_List_t t) : result (t & (betree_List_t t)) =
@@ -122,7 +122,7 @@ let betree_List_pop_front
   | Betree_List_Nil -> Fail Failure
   end
 
-(** [betree_main::betree::{betree_main::betree::List<T>#1}::hd]:
+(** [betree::betree::{betree::betree::List<T>#1}::hd]:
     Source: 'src/betree.rs', lines 318:4-318:22 *)
 let betree_List_hd (t : Type0) (self : betree_List_t t) : result t =
   begin match self with
@@ -130,7 +130,7 @@ let betree_List_hd (t : Type0) (self : betree_List_t t) : result t =
   | Betree_List_Nil -> Fail Failure
   end
 
-(** [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::head_has_key]:
+(** [betree::betree::{betree::betree::List<(u64, T)>#2}::head_has_key]:
     Source: 'src/betree.rs', lines 327:4-327:44 *)
 let betree_ListPairU64T_head_has_key
   (t : Type0) (self : betree_List_t (u64 & t)) (key : u64) : result bool =
@@ -139,7 +139,7 @@ let betree_ListPairU64T_head_has_key
   | Betree_List_Nil -> Ok false
   end
 
-(** [betree_main::betree::{betree_main::betree::List<(u64, T)>#2}::partition_at_pivot]:
+(** [betree::betree::{betree::betree::List<(u64, T)>#2}::partition_at_pivot]:
     Source: 'src/betree.rs', lines 339:4-339:73 *)
 let rec betree_ListPairU64T_partition_at_pivot
   (t : Type0) (self : betree_List_t (u64 & t)) (pivot : u64) :
@@ -158,7 +158,7 @@ let rec betree_ListPairU64T_partition_at_pivot
   | Betree_List_Nil -> Ok (Betree_List_Nil, Betree_List_Nil)
   end
 
-(** [betree_main::betree::{betree_main::betree::Leaf#3}::split]:
+(** [betree::betree::{betree::betree::Leaf#3}::split]:
     Source: 'src/betree.rs', lines 359:4-364:17 *)
 let betree_Leaf_split
   (self : betree_Leaf_t) (content : betree_List_t (u64 & u64))
@@ -179,7 +179,7 @@ let betree_Leaf_split
   Ok (st2, ({ id = self.id; pivot = pivot; left = n; right = n1 },
     node_id_cnt2))
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_for_key]:
+(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_for_key]:
     Source: 'src/betree.rs', lines 789:4-792:34 *)
 let rec betree_Node_lookup_first_message_for_key
   (key : u64) (msgs : betree_List_t (u64 & betree_Message_t)) :
@@ -203,7 +203,7 @@ let rec betree_Node_lookup_first_message_for_key
   | Betree_List_Nil -> Ok (Betree_List_Nil, Ok)
   end
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_in_bindings]:
+(** [betree::betree::{betree::betree::Node#5}::lookup_in_bindings]:
     Source: 'src/betree.rs', lines 636:4-636:80 *)
 let rec betree_Node_lookup_in_bindings
   (key : u64) (bindings : betree_List_t (u64 & u64)) :
@@ -219,7 +219,7 @@ let rec betree_Node_lookup_in_bindings
   | Betree_List_Nil -> Ok None
   end
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_upserts]:
+(** [betree::betree::{betree::betree::Node#5}::apply_upserts]:
     Source: 'src/betree.rs', lines 819:4-819:90 *)
 let rec betree_Node_apply_upserts
   (msgs : betree_List_t (u64 & betree_Message_t)) (prev : option u64)
@@ -246,7 +246,7 @@ let rec betree_Node_apply_upserts
         Betree_Message_Insert v) in
     Ok (v, msgs1)
 
-(** [betree_main::betree::{betree_main::betree::Internal#4}::lookup_in_children]:
+(** [betree::betree::{betree::betree::Internal#4}::lookup_in_children]:
     Source: 'src/betree.rs', lines 395:4-395:63 *)
 let rec betree_Internal_lookup_in_children
   (self : betree_Internal_t) (key : u64) (st : state) :
@@ -261,7 +261,7 @@ let rec betree_Internal_lookup_in_children
     let* (st1, (o, n)) = betree_Node_lookup self.right key st in
     Ok (st1, (o, { self with right = n }))
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup]:
+(** [betree::betree::{betree::betree::Node#5}::lookup]:
     Source: 'src/betree.rs', lines 709:4-709:58 *)
 and betree_Node_lookup
   (self : betree_Node_t) (key : u64) (st : state) :
@@ -317,7 +317,7 @@ and betree_Node_lookup
     Ok (st1, (o, Betree_Node_Leaf node))
   end
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::filter_messages_for_key]:
+(** [betree::betree::{betree::betree::Node#5}::filter_messages_for_key]:
     Source: 'src/betree.rs', lines 674:4-674:77 *)
 let rec betree_Node_filter_messages_for_key
   (key : u64) (msgs : betree_List_t (u64 & betree_Message_t)) :
@@ -337,7 +337,7 @@ let rec betree_Node_filter_messages_for_key
   | Betree_List_Nil -> Ok Betree_List_Nil
   end
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_first_message_after_key]:
+(** [betree::betree::{betree::betree::Node#5}::lookup_first_message_after_key]:
     Source: 'src/betree.rs', lines 689:4-692:34 *)
 let rec betree_Node_lookup_first_message_after_key
   (key : u64) (msgs : betree_List_t (u64 & betree_Message_t)) :
@@ -361,7 +361,7 @@ let rec betree_Node_lookup_first_message_after_key
   | Betree_List_Nil -> Ok (Betree_List_Nil, Ok)
   end
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_to_internal]:
+(** [betree::betree::{betree::betree::Node#5}::apply_to_internal]:
     Source: 'src/betree.rs', lines 521:4-521:89 *)
 let betree_Node_apply_to_internal
   (msgs : betree_List_t (u64 & betree_Message_t)) (key : u64)
@@ -421,7 +421,7 @@ let betree_Node_apply_to_internal
       betree_List_push_front (u64 & betree_Message_t) msgs1 (key, new_msg) in
     lookup_first_message_for_key_back msgs2
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_internal]:
+(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_internal]:
     Source: 'src/betree.rs', lines 502:4-505:5 *)
 let rec betree_Node_apply_messages_to_internal
   (msgs : betree_List_t (u64 & betree_Message_t))
@@ -437,7 +437,7 @@ let rec betree_Node_apply_messages_to_internal
   | Betree_List_Nil -> Ok msgs
   end
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::lookup_mut_in_bindings]:
+(** [betree::betree::{betree::betree::Node#5}::lookup_mut_in_bindings]:
     Source: 'src/betree.rs', lines 653:4-656:32 *)
 let rec betree_Node_lookup_mut_in_bindings
   (key : u64) (bindings : betree_List_t (u64 & u64)) :
@@ -461,7 +461,7 @@ let rec betree_Node_lookup_mut_in_bindings
   | Betree_List_Nil -> Ok (Betree_List_Nil, Ok)
   end
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_to_leaf]:
+(** [betree::betree::{betree::betree::Node#5}::apply_to_leaf]:
     Source: 'src/betree.rs', lines 460:4-460:87 *)
 let betree_Node_apply_to_leaf
   (bindings : betree_List_t (u64 & u64)) (key : u64)
@@ -497,7 +497,7 @@ let betree_Node_apply_to_leaf
       lookup_mut_in_bindings_back bindings2
     end
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages_to_leaf]:
+(** [betree::betree::{betree::betree::Node#5}::apply_messages_to_leaf]:
     Source: 'src/betree.rs', lines 444:4-447:5 *)
 let rec betree_Node_apply_messages_to_leaf
   (bindings : betree_List_t (u64 & u64))
@@ -513,7 +513,7 @@ let rec betree_Node_apply_messages_to_leaf
   | Betree_List_Nil -> Ok bindings
   end
 
-(** [betree_main::betree::{betree_main::betree::Internal#4}::flush]:
+(** [betree::betree::{betree::betree::Internal#4}::flush]:
     Source: 'src/betree.rs', lines 410:4-415:26 *)
 let rec betree_Internal_flush
   (self : betree_Internal_t) (params : betree_Params_t)
@@ -550,7 +550,7 @@ let rec betree_Internal_flush
     let (n, node_id_cnt1) = p1 in
     Ok (st1, (msgs_left, ({ self with right = n }, node_id_cnt1)))
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply_messages]:
+(** [betree::betree::{betree::betree::Node#5}::apply_messages]:
     Source: 'src/betree.rs', lines 588:4-593:5 *)
 and betree_Node_apply_messages
   (self : betree_Node_t) (params : betree_Params_t)
@@ -591,7 +591,7 @@ and betree_Node_apply_messages
       Ok (st2, (Betree_Node_Leaf { node with size = len }, node_id_cnt))
   end
 
-(** [betree_main::betree::{betree_main::betree::Node#5}::apply]:
+(** [betree::betree::{betree::betree::Node#5}::apply]:
     Source: 'src/betree.rs', lines 576:4-582:5 *)
 let betree_Node_apply
   (self : betree_Node_t) (params : betree_Params_t)
@@ -605,7 +605,7 @@ let betree_Node_apply
   let (self1, node_id_cnt1) = p in
   Ok (st1, (self1, node_id_cnt1))
 
-(** [betree_main::betree::{betree_main::betree::BeTree#6}::new]:
+(** [betree::betree::{betree::betree::BeTree#6}::new]:
     Source: 'src/betree.rs', lines 849:4-849:60 *)
 let betree_BeTree_new
   (min_flush_size : u64) (split_size : u64) (st : state) :
@@ -621,7 +621,7 @@ let betree_BeTree_new
       root = (Betree_Node_Leaf { id = id; size = 0 })
     })
 
-(** [betree_main::betree::{betree_main::betree::BeTree#6}::apply]:
+(** [betree::betree::{betree::betree::BeTree#6}::apply]:
     Source: 'src/betree.rs', lines 868:4-868:47 *)
 let betree_BeTree_apply
   (self : betree_BeTree_t) (key : u64) (msg : betree_Message_t) (st : state) :
@@ -632,7 +632,7 @@ let betree_BeTree_apply
   let (n, nic) = p in
   Ok (st1, { self with node_id_cnt = nic; root = n })
 
-(** [betree_main::betree::{betree_main::betree::BeTree#6}::insert]:
+(** [betree::betree::{betree::betree::BeTree#6}::insert]:
     Source: 'src/betree.rs', lines 874:4-874:52 *)
 let betree_BeTree_insert
   (self : betree_BeTree_t) (key : u64) (value : u64) (st : state) :
@@ -640,7 +640,7 @@ let betree_BeTree_insert
   =
   betree_BeTree_apply self key (Betree_Message_Insert value) st
 
-(** [betree_main::betree::{betree_main::betree::BeTree#6}::delete]:
+(** [betree::betree::{betree::betree::BeTree#6}::delete]:
     Source: 'src/betree.rs', lines 880:4-880:38 *)
 let betree_BeTree_delete
   (self : betree_BeTree_t) (key : u64) (st : state) :
@@ -648,7 +648,7 @@ let betree_BeTree_delete
   =
   betree_BeTree_apply self key Betree_Message_Delete st
 
-(** [betree_main::betree::{betree_main::betree::BeTree#6}::upsert]:
+(** [betree::betree::{betree::betree::BeTree#6}::upsert]:
     Source: 'src/betree.rs', lines 886:4-886:59 *)
 let betree_BeTree_upsert
   (self : betree_BeTree_t) (key : u64) (upd : betree_UpsertFunState_t)
@@ -657,7 +657,7 @@ let betree_BeTree_upsert
   =
   betree_BeTree_apply self key (Betree_Message_Upsert upd) st
 
-(** [betree_main::betree::{betree_main::betree::BeTree#6}::lookup]:
+(** [betree::betree::{betree::betree::BeTree#6}::lookup]:
     Source: 'src/betree.rs', lines 895:4-895:62 *)
 let betree_BeTree_lookup
   (self : betree_BeTree_t) (key : u64) (st : state) :
@@ -666,11 +666,11 @@ let betree_BeTree_lookup
   let* (st1, (o, n)) = betree_Node_lookup self.root key st in
   Ok (st1, (o, { self with root = n }))
 
-(** [betree_main::main]:
+(** [betree::main]:
     Source: 'src/main.rs', lines 4:0-4:9 *)
 let main : result unit =
   Ok ()
 
-(** Unit test for [betree_main::main] *)
+(** Unit test for [betree::main] *)
 let _ = assert_norm (main = Ok ())
 
diff --git a/tests/fstar/betree/BetreeMain.FunsExternal.fsti b/tests/fstar/betree/Betree.FunsExternal.fsti
index 8be98acf..db96eead 100644
--- a/tests/fstar/betree/BetreeMain.FunsExternal.fsti
+++ b/tests/fstar/betree/Betree.FunsExternal.fsti
@@ -1,29 +1,29 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [betree_main]: external function declarations *)
-module BetreeMain.FunsExternal
+(** [betree]: external function declarations *)
+module Betree.FunsExternal
 open Primitives
-include BetreeMain.Types
+include Betree.Types
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [betree_main::betree_utils::load_internal_node]:
+(** [betree::betree_utils::load_internal_node]:
     Source: 'src/betree_utils.rs', lines 98:0-98:63 *)
 val betree_utils_load_internal_node
   : u64 -> state -> result (state & (betree_List_t (u64 & betree_Message_t)))
 
-(** [betree_main::betree_utils::store_internal_node]:
+(** [betree::betree_utils::store_internal_node]:
     Source: 'src/betree_utils.rs', lines 115:0-115:71 *)
 val betree_utils_store_internal_node
   :
   u64 -> betree_List_t (u64 & betree_Message_t) -> state -> result (state &
     unit)
 
-(** [betree_main::betree_utils::load_leaf_node]:
+(** [betree::betree_utils::load_leaf_node]:
     Source: 'src/betree_utils.rs', lines 132:0-132:55 *)
 val betree_utils_load_leaf_node
   : u64 -> state -> result (state & (betree_List_t (u64 & u64)))
 
-(** [betree_main::betree_utils::store_leaf_node]:
+(** [betree::betree_utils::store_leaf_node]:
     Source: 'src/betree_utils.rs', lines 145:0-145:63 *)
 val betree_utils_store_leaf_node
   : u64 -> betree_List_t (u64 & u64) -> state -> result (state & unit)
diff --git a/tests/fstar/betree/BetreeMain.Types.fst b/tests/fstar/betree/Betree.Types.fst
index b87219b2..6b8e063b 100644
--- a/tests/fstar/betree/BetreeMain.Types.fst
+++ b/tests/fstar/betree/Betree.Types.fst
@@ -1,56 +1,56 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [betree_main]: type definitions *)
-module BetreeMain.Types
+(** [betree]: type definitions *)
+module Betree.Types
 open Primitives
-include BetreeMain.TypesExternal
+include Betree.TypesExternal
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
-(** [betree_main::betree::List]
+(** [betree::betree::List]
     Source: 'src/betree.rs', lines 17:0-17:23 *)
 type betree_List_t (t : Type0) =
 | Betree_List_Cons : t -> betree_List_t t -> betree_List_t t
 | Betree_List_Nil : betree_List_t t
 
-(** [betree_main::betree::UpsertFunState]
+(** [betree::betree::UpsertFunState]
     Source: 'src/betree.rs', lines 63:0-63:23 *)
 type betree_UpsertFunState_t =
 | Betree_UpsertFunState_Add : u64 -> betree_UpsertFunState_t
 | Betree_UpsertFunState_Sub : u64 -> betree_UpsertFunState_t
 
-(** [betree_main::betree::Message]
+(** [betree::betree::Message]
     Source: 'src/betree.rs', lines 69:0-69:23 *)
 type betree_Message_t =
 | Betree_Message_Insert : u64 -> betree_Message_t
 | Betree_Message_Delete : betree_Message_t
 | Betree_Message_Upsert : betree_UpsertFunState_t -> betree_Message_t
 
-(** [betree_main::betree::Leaf]
+(** [betree::betree::Leaf]
     Source: 'src/betree.rs', lines 167:0-167:11 *)
 type betree_Leaf_t = { id : u64; size : u64; }
 
-(** [betree_main::betree::Internal]
+(** [betree::betree::Internal]
     Source: 'src/betree.rs', lines 156:0-156:15 *)
 type betree_Internal_t =
 {
   id : u64; pivot : u64; left : betree_Node_t; right : betree_Node_t;
 }
 
-(** [betree_main::betree::Node]
+(** [betree::betree::Node]
     Source: 'src/betree.rs', lines 179:0-179:9 *)
 and betree_Node_t =
 | Betree_Node_Internal : betree_Internal_t -> betree_Node_t
 | Betree_Node_Leaf : betree_Leaf_t -> betree_Node_t
 
-(** [betree_main::betree::Params]
+(** [betree::betree::Params]
     Source: 'src/betree.rs', lines 187:0-187:13 *)
 type betree_Params_t = { min_flush_size : u64; split_size : u64; }
 
-(** [betree_main::betree::NodeIdCounter]
+(** [betree::betree::NodeIdCounter]
     Source: 'src/betree.rs', lines 201:0-201:20 *)
 type betree_NodeIdCounter_t = { next_node_id : u64; }
 
-(** [betree_main::betree::BeTree]
+(** [betree::betree::BeTree]
     Source: 'src/betree.rs', lines 218:0-218:17 *)
 type betree_BeTree_t =
 {
diff --git a/tests/fstar/betree/BetreeMain.TypesExternal.fsti b/tests/fstar/betree/Betree.TypesExternal.fsti
index 1b2c53a6..39e53ec9 100644
--- a/tests/fstar/betree/BetreeMain.TypesExternal.fsti
+++ b/tests/fstar/betree/Betree.TypesExternal.fsti
@@ -1,6 +1,6 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [betree_main]: external type declarations *)
-module BetreeMain.TypesExternal
+(** [betree]: external type declarations *)
+module Betree.TypesExternal
 open Primitives
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
diff --git a/tests/fstar/demo/Demo.fst b/tests/fstar/demo/Demo.fst
index 41fd9804..d89f32e0 100644
--- a/tests/fstar/demo/Demo.fst
+++ b/tests/fstar/demo/Demo.fst
@@ -6,7 +6,7 @@ open Primitives
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [demo::choose]:
-    Source: 'tests/src/demo.rs', lines 5:0-5:70 *)
+    Source: 'tests/src/demo.rs', lines 7:0-7:70 *)
 let choose
   (t : Type0) (b : bool) (x : t) (y : t) : result (t & (t -> result (t & t))) =
   if b
@@ -14,33 +14,33 @@ let choose
   else let back = fun ret -> Ok (x, ret) in Ok (y, back)
 
 (** [demo::mul2_add1]:
-    Source: 'tests/src/demo.rs', lines 13:0-13:31 *)
+    Source: 'tests/src/demo.rs', lines 15:0-15:31 *)
 let mul2_add1 (x : u32) : result u32 =
   let* i = u32_add x x in u32_add i 1
 
 (** [demo::use_mul2_add1]:
-    Source: 'tests/src/demo.rs', lines 17:0-17:43 *)
+    Source: 'tests/src/demo.rs', lines 19:0-19:43 *)
 let use_mul2_add1 (x : u32) (y : u32) : result u32 =
   let* i = mul2_add1 x in u32_add i y
 
 (** [demo::incr]:
-    Source: 'tests/src/demo.rs', lines 21:0-21:31 *)
+    Source: 'tests/src/demo.rs', lines 23:0-23:31 *)
 let incr (x : u32) : result u32 =
   u32_add x 1
 
 (** [demo::use_incr]:
-    Source: 'tests/src/demo.rs', lines 25:0-25:17 *)
+    Source: 'tests/src/demo.rs', lines 27:0-27:17 *)
 let use_incr : result unit =
   let* x = incr 0 in let* x1 = incr x in let* _ = incr x1 in Ok ()
 
 (** [demo::CList]
-    Source: 'tests/src/demo.rs', lines 34:0-34:17 *)
+    Source: 'tests/src/demo.rs', lines 36:0-36:17 *)
 type cList_t (t : Type0) =
 | CList_CCons : t -> cList_t t -> cList_t t
 | CList_CNil : cList_t t
 
 (** [demo::list_nth]:
-    Source: 'tests/src/demo.rs', lines 39:0-39:56 *)
+    Source: 'tests/src/demo.rs', lines 41:0-41:56 *)
 let rec list_nth (t : Type0) (n : nat) (l : cList_t t) (i : u32) : result t =
   if is_zero n
   then Fail OutOfFuel
@@ -53,7 +53,7 @@ let rec list_nth (t : Type0) (n : nat) (l : cList_t t) (i : u32) : result t =
     end
 
 (** [demo::list_nth_mut]:
-    Source: 'tests/src/demo.rs', lines 54:0-54:68 *)
+    Source: 'tests/src/demo.rs', lines 56:0-56:68 *)
 let rec list_nth_mut
   (t : Type0) (n : nat) (l : cList_t t) (i : u32) :
   result (t & (t -> result (cList_t t)))
@@ -77,7 +77,7 @@ let rec list_nth_mut
     end
 
 (** [demo::list_nth_mut1]: loop 0:
-    Source: 'tests/src/demo.rs', lines 69:0-78:1 *)
+    Source: 'tests/src/demo.rs', lines 71:0-80:1 *)
 let rec list_nth_mut1_loop
   (t : Type0) (n : nat) (l : cList_t t) (i : u32) :
   result (t & (t -> result (cList_t t)))
@@ -99,7 +99,7 @@ let rec list_nth_mut1_loop
     end
 
 (** [demo::list_nth_mut1]:
-    Source: 'tests/src/demo.rs', lines 69:0-69:77 *)
+    Source: 'tests/src/demo.rs', lines 71:0-71:77 *)
 let list_nth_mut1
   (t : Type0) (n : nat) (l : cList_t t) (i : u32) :
   result (t & (t -> result (cList_t t)))
@@ -107,7 +107,7 @@ let list_nth_mut1
   list_nth_mut1_loop t n l i
 
 (** [demo::i32_id]:
-    Source: 'tests/src/demo.rs', lines 80:0-80:28 *)
+    Source: 'tests/src/demo.rs', lines 82:0-82:28 *)
 let rec i32_id (n : nat) (i : i32) : result i32 =
   if is_zero n
   then Fail OutOfFuel
@@ -118,7 +118,7 @@ let rec i32_id (n : nat) (i : i32) : result i32 =
     else let* i1 = i32_sub i 1 in let* i2 = i32_id n1 i1 in i32_add i2 1
 
 (** [demo::list_tail]:
-    Source: 'tests/src/demo.rs', lines 88:0-88:64 *)
+    Source: 'tests/src/demo.rs', lines 90:0-90:64 *)
 let rec list_tail
   (t : Type0) (n : nat) (l : cList_t t) :
   result ((cList_t t) & (cList_t t -> result (cList_t t)))
@@ -137,20 +137,20 @@ let rec list_tail
     end
 
 (** Trait declaration: [demo::Counter]
-    Source: 'tests/src/demo.rs', lines 97:0-97:17 *)
+    Source: 'tests/src/demo.rs', lines 99:0-99:17 *)
 noeq type counter_t (self : Type0) = { incr : self -> result (usize & self); }
 
 (** [demo::{(demo::Counter for usize)}::incr]:
-    Source: 'tests/src/demo.rs', lines 102:4-102:31 *)
+    Source: 'tests/src/demo.rs', lines 104:4-104:31 *)
 let counterUsize_incr (self : usize) : result (usize & usize) =
   let* self1 = usize_add self 1 in Ok (self, self1)
 
 (** Trait implementation: [demo::{(demo::Counter for usize)}]
-    Source: 'tests/src/demo.rs', lines 101:0-101:22 *)
+    Source: 'tests/src/demo.rs', lines 103:0-103:22 *)
 let counterUsize : counter_t usize = { incr = counterUsize_incr; }
 
 (** [demo::use_counter]:
-    Source: 'tests/src/demo.rs', lines 109:0-109:59 *)
+    Source: 'tests/src/demo.rs', lines 111:0-111:59 *)
 let use_counter
   (t : Type0) (counterInst : counter_t t) (cnt : t) : result (usize & t) =
   counterInst.incr cnt
diff --git a/tests/fstar/hashmap/Hashmap.Clauses.Template.fst b/tests/fstar/hashmap/Hashmap.Clauses.Template.fst
index b96f6784..57003613 100644
--- a/tests/fstar/hashmap/Hashmap.Clauses.Template.fst
+++ b/tests/fstar/hashmap/Hashmap.Clauses.Template.fst
@@ -7,63 +7,63 @@ open Hashmap.Types
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 50:4-56:5 *)
+    Source: 'tests/src/hashmap.rs', lines 60:4-66:5 *)
 unfold
 let hashMap_allocate_slots_loop_decreases (t : Type0)
   (slots : alloc_vec_Vec (list_t t)) (n : usize) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::clear]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 80:4-88:5 *)
+    Source: 'tests/src/hashmap.rs', lines 90:4-98:5 *)
 unfold
 let hashMap_clear_loop_decreases (t : Type0) (slots : alloc_vec_Vec (list_t t))
   (i : usize) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 97:4-114:5 *)
+    Source: 'tests/src/hashmap.rs', lines 107:4-124:5 *)
 unfold
 let hashMap_insert_in_list_loop_decreases (t : Type0) (key : usize) (value : t)
   (ls : list_t t) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 183:4-196:5 *)
+    Source: 'tests/src/hashmap.rs', lines 193:4-206:5 *)
 unfold
 let hashMap_move_elements_from_list_loop_decreases (t : Type0)
   (ntable : hashMap_t t) (ls : list_t t) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 171:4-180:5 *)
+    Source: 'tests/src/hashmap.rs', lines 181:4-190:5 *)
 unfold
 let hashMap_move_elements_loop_decreases (t : Type0) (ntable : hashMap_t t)
   (slots : alloc_vec_Vec (list_t t)) (i : usize) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 206:4-219:5 *)
+    Source: 'tests/src/hashmap.rs', lines 216:4-229:5 *)
 unfold
 let hashMap_contains_key_in_list_loop_decreases (t : Type0) (key : usize)
   (ls : list_t t) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 224:4-237:5 *)
+    Source: 'tests/src/hashmap.rs', lines 234:4-247:5 *)
 unfold
 let hashMap_get_in_list_loop_decreases (t : Type0) (key : usize)
   (ls : list_t t) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 245:4-254:5 *)
+    Source: 'tests/src/hashmap.rs', lines 255:4-264:5 *)
 unfold
 let hashMap_get_mut_in_list_loop_decreases (t : Type0) (ls : list_t t)
   (key : usize) : nat =
   admit ()
 
 (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 265:4-291:5 *)
+    Source: 'tests/src/hashmap.rs', lines 275:4-301:5 *)
 unfold
 let hashMap_remove_from_list_loop_decreases (t : Type0) (key : usize)
   (ls : list_t t) : nat =
diff --git a/tests/fstar/hashmap/Hashmap.Funs.fst b/tests/fstar/hashmap/Hashmap.Funs.fst
index 2aca9fbe..0e991720 100644
--- a/tests/fstar/hashmap/Hashmap.Funs.fst
+++ b/tests/fstar/hashmap/Hashmap.Funs.fst
@@ -3,17 +3,18 @@
 module Hashmap.Funs
 open Primitives
 include Hashmap.Types
+include Hashmap.FunsExternal
 include Hashmap.Clauses
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [hashmap::hash_key]:
-    Source: 'tests/src/hashmap.rs', lines 27:0-27:32 *)
+    Source: 'tests/src/hashmap.rs', lines 37:0-37:32 *)
 let hash_key (k : usize) : result usize =
   Ok k
 
 (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 50:4-56:5 *)
+    Source: 'tests/src/hashmap.rs', lines 60:4-66:5 *)
 let rec hashMap_allocate_slots_loop
   (t : Type0) (slots : alloc_vec_Vec (list_t t)) (n : usize) :
   Tot (result (alloc_vec_Vec (list_t t)))
@@ -27,7 +28,7 @@ let rec hashMap_allocate_slots_loop
   else Ok slots
 
 (** [hashmap::{hashmap::HashMap<T>}::allocate_slots]:
-    Source: 'tests/src/hashmap.rs', lines 50:4-50:76 *)
+    Source: 'tests/src/hashmap.rs', lines 60:4-60:76 *)
 let hashMap_allocate_slots
   (t : Type0) (slots : alloc_vec_Vec (list_t t)) (n : usize) :
   result (alloc_vec_Vec (list_t t))
@@ -35,7 +36,7 @@ let hashMap_allocate_slots
   hashMap_allocate_slots_loop t slots n
 
 (** [hashmap::{hashmap::HashMap<T>}::new_with_capacity]:
-    Source: 'tests/src/hashmap.rs', lines 59:4-63:13 *)
+    Source: 'tests/src/hashmap.rs', lines 69:4-73:13 *)
 let hashMap_new_with_capacity
   (t : Type0) (capacity : usize) (max_load_dividend : usize)
   (max_load_divisor : usize) :
@@ -54,12 +55,12 @@ let hashMap_new_with_capacity
     }
 
 (** [hashmap::{hashmap::HashMap<T>}::new]:
-    Source: 'tests/src/hashmap.rs', lines 75:4-75:24 *)
+    Source: 'tests/src/hashmap.rs', lines 85:4-85:24 *)
 let hashMap_new (t : Type0) : result (hashMap_t t) =
   hashMap_new_with_capacity t 32 4 5
 
 (** [hashmap::{hashmap::HashMap<T>}::clear]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 80:4-88:5 *)
+    Source: 'tests/src/hashmap.rs', lines 90:4-98:5 *)
 let rec hashMap_clear_loop
   (t : Type0) (slots : alloc_vec_Vec (list_t t)) (i : usize) :
   Tot (result (alloc_vec_Vec (list_t t)))
@@ -77,18 +78,18 @@ let rec hashMap_clear_loop
   else Ok slots
 
 (** [hashmap::{hashmap::HashMap<T>}::clear]:
-    Source: 'tests/src/hashmap.rs', lines 80:4-80:27 *)
+    Source: 'tests/src/hashmap.rs', lines 90:4-90:27 *)
 let hashMap_clear (t : Type0) (self : hashMap_t t) : result (hashMap_t t) =
   let* hm = hashMap_clear_loop t self.slots 0 in
   Ok { self with num_entries = 0; slots = hm }
 
 (** [hashmap::{hashmap::HashMap<T>}::len]:
-    Source: 'tests/src/hashmap.rs', lines 90:4-90:30 *)
+    Source: 'tests/src/hashmap.rs', lines 100:4-100:30 *)
 let hashMap_len (t : Type0) (self : hashMap_t t) : result usize =
   Ok self.num_entries
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 97:4-114:5 *)
+    Source: 'tests/src/hashmap.rs', lines 107:4-124:5 *)
 let rec hashMap_insert_in_list_loop
   (t : Type0) (key : usize) (value : t) (ls : list_t t) :
   Tot (result (bool & (list_t t)))
@@ -105,7 +106,7 @@ let rec hashMap_insert_in_list_loop
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 97:4-97:71 *)
+    Source: 'tests/src/hashmap.rs', lines 107:4-107:71 *)
 let hashMap_insert_in_list
   (t : Type0) (key : usize) (value : t) (ls : list_t t) :
   result (bool & (list_t t))
@@ -113,7 +114,7 @@ let hashMap_insert_in_list
   hashMap_insert_in_list_loop t key value ls
 
 (** [hashmap::{hashmap::HashMap<T>}::insert_no_resize]:
-    Source: 'tests/src/hashmap.rs', lines 117:4-117:54 *)
+    Source: 'tests/src/hashmap.rs', lines 127:4-127:54 *)
 let hashMap_insert_no_resize
   (t : Type0) (self : hashMap_t t) (key : usize) (value : t) :
   result (hashMap_t t)
@@ -134,7 +135,7 @@ let hashMap_insert_no_resize
   else let* v = index_mut_back l1 in Ok { self with slots = v }
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 183:4-196:5 *)
+    Source: 'tests/src/hashmap.rs', lines 193:4-206:5 *)
 let rec hashMap_move_elements_from_list_loop
   (t : Type0) (ntable : hashMap_t t) (ls : list_t t) :
   Tot (result (hashMap_t t))
@@ -148,13 +149,13 @@ let rec hashMap_move_elements_from_list_loop
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements_from_list]:
-    Source: 'tests/src/hashmap.rs', lines 183:4-183:72 *)
+    Source: 'tests/src/hashmap.rs', lines 193:4-193:72 *)
 let hashMap_move_elements_from_list
   (t : Type0) (ntable : hashMap_t t) (ls : list_t t) : result (hashMap_t t) =
   hashMap_move_elements_from_list_loop t ntable ls
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 171:4-180:5 *)
+    Source: 'tests/src/hashmap.rs', lines 181:4-190:5 *)
 let rec hashMap_move_elements_loop
   (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (list_t t))
   (i : usize) :
@@ -175,7 +176,7 @@ let rec hashMap_move_elements_loop
   else Ok (ntable, slots)
 
 (** [hashmap::{hashmap::HashMap<T>}::move_elements]:
-    Source: 'tests/src/hashmap.rs', lines 171:4-171:95 *)
+    Source: 'tests/src/hashmap.rs', lines 181:4-181:95 *)
 let hashMap_move_elements
   (t : Type0) (ntable : hashMap_t t) (slots : alloc_vec_Vec (list_t t))
   (i : usize) :
@@ -184,7 +185,7 @@ let hashMap_move_elements
   hashMap_move_elements_loop t ntable slots i
 
 (** [hashmap::{hashmap::HashMap<T>}::try_resize]:
-    Source: 'tests/src/hashmap.rs', lines 140:4-140:28 *)
+    Source: 'tests/src/hashmap.rs', lines 150:4-150:28 *)
 let hashMap_try_resize
   (t : Type0) (self : hashMap_t t) : result (hashMap_t t) =
   let* max_usize = scalar_cast U32 Usize core_u32_max in
@@ -204,7 +205,7 @@ let hashMap_try_resize
   else Ok { self with max_load_factor = (i, i1) }
 
 (** [hashmap::{hashmap::HashMap<T>}::insert]:
-    Source: 'tests/src/hashmap.rs', lines 129:4-129:48 *)
+    Source: 'tests/src/hashmap.rs', lines 139:4-139:48 *)
 let hashMap_insert
   (t : Type0) (self : hashMap_t t) (key : usize) (value : t) :
   result (hashMap_t t)
@@ -214,7 +215,7 @@ let hashMap_insert
   if i > self1.max_load then hashMap_try_resize t self1 else Ok self1
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 206:4-219:5 *)
+    Source: 'tests/src/hashmap.rs', lines 216:4-229:5 *)
 let rec hashMap_contains_key_in_list_loop
   (t : Type0) (key : usize) (ls : list_t t) :
   Tot (result bool)
@@ -227,13 +228,13 @@ let rec hashMap_contains_key_in_list_loop
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 206:4-206:68 *)
+    Source: 'tests/src/hashmap.rs', lines 216:4-216:68 *)
 let hashMap_contains_key_in_list
   (t : Type0) (key : usize) (ls : list_t t) : result bool =
   hashMap_contains_key_in_list_loop t key ls
 
 (** [hashmap::{hashmap::HashMap<T>}::contains_key]:
-    Source: 'tests/src/hashmap.rs', lines 199:4-199:49 *)
+    Source: 'tests/src/hashmap.rs', lines 209:4-209:49 *)
 let hashMap_contains_key
   (t : Type0) (self : hashMap_t t) (key : usize) : result bool =
   let* hash = hash_key key in
@@ -246,7 +247,7 @@ let hashMap_contains_key
   hashMap_contains_key_in_list t key l
 
 (** [hashmap::{hashmap::HashMap<T>}::get_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 224:4-237:5 *)
+    Source: 'tests/src/hashmap.rs', lines 234:4-247:5 *)
 let rec hashMap_get_in_list_loop
   (t : Type0) (key : usize) (ls : list_t t) :
   Tot (result t) (decreases (hashMap_get_in_list_loop_decreases t key ls))
@@ -258,12 +259,12 @@ let rec hashMap_get_in_list_loop
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::get_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 224:4-224:70 *)
+    Source: 'tests/src/hashmap.rs', lines 234:4-234:70 *)
 let hashMap_get_in_list (t : Type0) (key : usize) (ls : list_t t) : result t =
   hashMap_get_in_list_loop t key ls
 
 (** [hashmap::{hashmap::HashMap<T>}::get]:
-    Source: 'tests/src/hashmap.rs', lines 239:4-239:55 *)
+    Source: 'tests/src/hashmap.rs', lines 249:4-249:55 *)
 let hashMap_get (t : Type0) (self : hashMap_t t) (key : usize) : result t =
   let* hash = hash_key key in
   let i = alloc_vec_Vec_len (list_t t) self.slots in
@@ -275,7 +276,7 @@ let hashMap_get (t : Type0) (self : hashMap_t t) (key : usize) : result t =
   hashMap_get_in_list t key l
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 245:4-254:5 *)
+    Source: 'tests/src/hashmap.rs', lines 255:4-264:5 *)
 let rec hashMap_get_mut_in_list_loop
   (t : Type0) (ls : list_t t) (key : usize) :
   Tot (result (t & (t -> result (list_t t))))
@@ -294,7 +295,7 @@ let rec hashMap_get_mut_in_list_loop
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 245:4-245:86 *)
+    Source: 'tests/src/hashmap.rs', lines 255:4-255:86 *)
 let hashMap_get_mut_in_list
   (t : Type0) (ls : list_t t) (key : usize) :
   result (t & (t -> result (list_t t)))
@@ -302,7 +303,7 @@ let hashMap_get_mut_in_list
   hashMap_get_mut_in_list_loop t ls key
 
 (** [hashmap::{hashmap::HashMap<T>}::get_mut]:
-    Source: 'tests/src/hashmap.rs', lines 257:4-257:67 *)
+    Source: 'tests/src/hashmap.rs', lines 267:4-267:67 *)
 let hashMap_get_mut
   (t : Type0) (self : hashMap_t t) (key : usize) :
   result (t & (t -> result (hashMap_t t)))
@@ -323,7 +324,7 @@ let hashMap_get_mut
   Ok (x, back)
 
 (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 265:4-291:5 *)
+    Source: 'tests/src/hashmap.rs', lines 275:4-301:5 *)
 let rec hashMap_remove_from_list_loop
   (t : Type0) (key : usize) (ls : list_t t) :
   Tot (result ((option t) & (list_t t)))
@@ -346,7 +347,7 @@ let rec hashMap_remove_from_list_loop
   end
 
 (** [hashmap::{hashmap::HashMap<T>}::remove_from_list]:
-    Source: 'tests/src/hashmap.rs', lines 265:4-265:69 *)
+    Source: 'tests/src/hashmap.rs', lines 275:4-275:69 *)
 let hashMap_remove_from_list
   (t : Type0) (key : usize) (ls : list_t t) :
   result ((option t) & (list_t t))
@@ -354,7 +355,7 @@ let hashMap_remove_from_list
   hashMap_remove_from_list_loop t key ls
 
 (** [hashmap::{hashmap::HashMap<T>}::remove]:
-    Source: 'tests/src/hashmap.rs', lines 294:4-294:52 *)
+    Source: 'tests/src/hashmap.rs', lines 304:4-304:52 *)
 let hashMap_remove
   (t : Type0) (self : hashMap_t t) (key : usize) :
   result ((option t) & (hashMap_t t))
@@ -375,8 +376,16 @@ let hashMap_remove
     Ok (Some x1, { self with num_entries = i1; slots = v })
   end
 
+(** [hashmap::insert_on_disk]:
+    Source: 'tests/src/hashmap.rs', lines 335:0-335:43 *)
+let insert_on_disk
+  (key : usize) (value : u64) (st : state) : result (state & unit) =
+  let* (st1, hm) = utils_deserialize st in
+  let* hm1 = hashMap_insert u64 hm key value in
+  utils_serialize hm1 st1
+
 (** [hashmap::test1]:
-    Source: 'tests/src/hashmap.rs', lines 315:0-315:10 *)
+    Source: 'tests/src/hashmap.rs', lines 350:0-350:10 *)
 let test1 : result unit =
   let* hm = hashMap_new u64 in
   let* hm1 = hashMap_insert u64 hm 0 42 in
diff --git a/tests/fstar/hashmap/Hashmap.FunsExternal.fsti b/tests/fstar/hashmap/Hashmap.FunsExternal.fsti
new file mode 100644
index 00000000..f2f305e6
--- /dev/null
+++ b/tests/fstar/hashmap/Hashmap.FunsExternal.fsti
@@ -0,0 +1,16 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
+(** [hashmap]: external function declarations *)
+module Hashmap.FunsExternal
+open Primitives
+include Hashmap.Types
+
+#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
+
+(** [hashmap::utils::deserialize]:
+    Source: 'tests/src/hashmap.rs', lines 330:4-330:47 *)
+val utils_deserialize : state -> result (state & (hashMap_t u64))
+
+(** [hashmap::utils::serialize]:
+    Source: 'tests/src/hashmap.rs', lines 325:4-325:46 *)
+val utils_serialize : hashMap_t u64 -> state -> result (state & unit)
+
diff --git a/tests/fstar/hashmap_on_disk/HashmapMain.Properties.fst b/tests/fstar/hashmap/Hashmap.Properties.fst
index beb3dc2c..ed118c46 100644
--- a/tests/fstar/hashmap_on_disk/HashmapMain.Properties.fst
+++ b/tests/fstar/hashmap/Hashmap.Properties.fst
@@ -1,7 +1,7 @@
 (** Properties about the hashmap written on disk *)
-module HashmapMain.Properties
+module Hashmap.Properties
 open Primitives
-open HashmapMain.Funs
+open Hashmap.Funs
 
 #set-options "--z3rlimit 50 --fuel 0 --ifuel 1"
 
@@ -13,23 +13,23 @@ open HashmapMain.Funs
 
 /// [state_v] gives us the hash map currently stored on disk
 assume
-val state_v : state -> hashmap_HashMap_t u64
+val state_v : state -> hashMap_t u64
 
 /// [serialize] updates the hash map stored on disk
 assume
-val serialize_lem (hm : hashmap_HashMap_t u64) (st : state) : Lemma (
-  match hashmap_utils_serialize hm st with
+val serialize_lem (hm : hashMap_t u64) (st : state) : Lemma (
+  match utils_serialize hm st with
   | Fail _ -> True
   | Ok (st', ()) -> state_v st' == hm)
-  [SMTPat (hashmap_utils_serialize hm st)]
+  [SMTPat (utils_serialize hm st)]
 
 /// [deserialize] gives us the hash map stored on disk, without updating it
 assume
 val deserialize_lem (st : state) : Lemma (
-  match hashmap_utils_deserialize st with
+  match utils_deserialize st with
   | Fail _ -> True
   | Ok (st', hm) -> hm == state_v st /\ st' == st)
-  [SMTPat (hashmap_utils_deserialize st)]
+  [SMTPat (utils_deserialize st)]
 
 (*** Lemmas *)
 
@@ -41,7 +41,7 @@ val insert_on_disk_lem (key : usize) (value : u64) (st : state) : Lemma (
   | Fail _ -> True
   | Ok (st', ()) ->
     let hm = state_v st in
-    match hashmap_HashMap_insert u64 hm key value with
+    match hashMap_insert u64 hm key value with
     | Fail _ -> False
     | Ok hm' -> hm' == state_v st')
 
diff --git a/tests/fstar/hashmap/Hashmap.Types.fst b/tests/fstar/hashmap/Hashmap.Types.fst
index ee06442f..818cb9d1 100644
--- a/tests/fstar/hashmap/Hashmap.Types.fst
+++ b/tests/fstar/hashmap/Hashmap.Types.fst
@@ -2,17 +2,18 @@
 (** [hashmap]: type definitions *)
 module Hashmap.Types
 open Primitives
+include Hashmap.TypesExternal
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [hashmap::List]
-    Source: 'tests/src/hashmap.rs', lines 19:0-19:16 *)
+    Source: 'tests/src/hashmap.rs', lines 29:0-29:16 *)
 type list_t (t : Type0) =
 | List_Cons : usize -> t -> list_t t -> list_t t
 | List_Nil : list_t t
 
 (** [hashmap::HashMap]
-    Source: 'tests/src/hashmap.rs', lines 35:0-35:21 *)
+    Source: 'tests/src/hashmap.rs', lines 45:0-45:21 *)
 type hashMap_t (t : Type0) =
 {
   num_entries : usize;
diff --git a/tests/fstar/hashmap_on_disk/HashmapMain.TypesExternal.fsti b/tests/fstar/hashmap/Hashmap.TypesExternal.fsti
index 75747408..66cb659b 100644
--- a/tests/fstar/hashmap_on_disk/HashmapMain.TypesExternal.fsti
+++ b/tests/fstar/hashmap/Hashmap.TypesExternal.fsti
@@ -1,6 +1,6 @@
 (** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [hashmap_main]: external type declarations *)
-module HashmapMain.TypesExternal
+(** [hashmap]: external type declarations *)
+module Hashmap.TypesExternal
 open Primitives
 
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
diff --git a/tests/fstar/hashmap_on_disk/HashmapMain.Clauses.Template.fst b/tests/fstar/hashmap_on_disk/HashmapMain.Clauses.Template.fst
deleted file mode 100644
index 0715bdcb..00000000
--- a/tests/fstar/hashmap_on_disk/HashmapMain.Clauses.Template.fst
+++ /dev/null
@@ -1,72 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [hashmap_main]: templates for the decreases clauses *)
-module HashmapMain.Clauses.Template
-open Primitives
-open HashmapMain.Types
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 50:4-56:5 *)
-unfold
-let hashmap_HashMap_allocate_slots_loop_decreases (t : Type0)
-  (slots : alloc_vec_Vec (hashmap_List_t t)) (n : usize) : nat =
-  admit ()
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 80:4-88:5 *)
-unfold
-let hashmap_HashMap_clear_loop_decreases (t : Type0)
-  (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) : nat =
-  admit ()
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 97:4-114:5 *)
-unfold
-let hashmap_HashMap_insert_in_list_loop_decreases (t : Type0) (key : usize)
-  (value : t) (ls : hashmap_List_t t) : nat =
-  admit ()
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 183:4-196:5 *)
-unfold
-let hashmap_HashMap_move_elements_from_list_loop_decreases (t : Type0)
-  (ntable : hashmap_HashMap_t t) (ls : hashmap_List_t t) : nat =
-  admit ()
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 171:4-180:5 *)
-unfold
-let hashmap_HashMap_move_elements_loop_decreases (t : Type0)
-  (ntable : hashmap_HashMap_t t) (slots : alloc_vec_Vec (hashmap_List_t t))
-  (i : usize) : nat =
-  admit ()
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 206:4-219:5 *)
-unfold
-let hashmap_HashMap_contains_key_in_list_loop_decreases (t : Type0)
-  (key : usize) (ls : hashmap_List_t t) : nat =
-  admit ()
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 224:4-237:5 *)
-unfold
-let hashmap_HashMap_get_in_list_loop_decreases (t : Type0) (key : usize)
-  (ls : hashmap_List_t t) : nat =
-  admit ()
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 245:4-254:5 *)
-unfold
-let hashmap_HashMap_get_mut_in_list_loop_decreases (t : Type0)
-  (ls : hashmap_List_t t) (key : usize) : nat =
-  admit ()
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: decreases clause
-    Source: 'tests/src/hashmap.rs', lines 265:4-291:5 *)
-unfold
-let hashmap_HashMap_remove_from_list_loop_decreases (t : Type0) (key : usize)
-  (ls : hashmap_List_t t) : nat =
-  admit ()
-
diff --git a/tests/fstar/hashmap_on_disk/HashmapMain.Clauses.fst b/tests/fstar/hashmap_on_disk/HashmapMain.Clauses.fst
deleted file mode 100644
index be5a4ab1..00000000
--- a/tests/fstar/hashmap_on_disk/HashmapMain.Clauses.fst
+++ /dev/null
@@ -1,61 +0,0 @@
-(** [hashmap]: the decreases clauses *)
-module HashmapMain.Clauses
-open Primitives
-open FStar.List.Tot
-open HashmapMain.Types
-
-#set-options "--z3rlimit 50 --fuel 0 --ifuel 1"
-
-(** [hashmap::HashMap::allocate_slots]: decreases clause *)
-unfold
-let hashmap_HashMap_allocate_slots_loop_decreases (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t))
-  (n : usize) : nat = n
-
-(** [hashmap::HashMap::clear]: decreases clause *)
-unfold
-let hashmap_HashMap_clear_loop_decreases (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t))
-  (i : usize) : nat =
-  if i < length slots then length slots - i else 0
-
-(** [hashmap::HashMap::insert_in_list]: decreases clause *)
-unfold
-let hashmap_HashMap_insert_in_list_loop_decreases (t : Type0) (key : usize) (value : t)
-  (ls : hashmap_List_t t) : hashmap_List_t t =
-  ls
-
-(** [hashmap::HashMap::move_elements_from_list]: decreases clause *)
-unfold
-let hashmap_HashMap_move_elements_from_list_loop_decreases (t : Type0)
-  (ntable : hashmap_HashMap_t t) (ls : hashmap_List_t t) : hashmap_List_t t =
-  ls
-
-(** [hashmap::HashMap::move_elements]: decreases clause *)
-unfold
-let hashmap_HashMap_move_elements_loop_decreases (t : Type0) (ntable : hashmap_HashMap_t t)
-  (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) : nat =
-  if i < length slots then length slots - i else 0
-
-(** [hashmap::HashMap::contains_key_in_list]: decreases clause *)
-unfold
-let hashmap_HashMap_contains_key_in_list_loop_decreases (t : Type0) (key : usize)
-  (ls : hashmap_List_t t) : hashmap_List_t t =
-  ls
-
-(** [hashmap::HashMap::get_in_list]: decreases clause *)
-unfold
-let hashmap_HashMap_get_in_list_loop_decreases (t : Type0) (key : usize) (ls : hashmap_List_t t) :
-  hashmap_List_t t =
-  ls
-
-(** [hashmap::HashMap::get_mut_in_list]: decreases clause *)
-unfold
-let hashmap_HashMap_get_mut_in_list_loop_decreases (t : Type0)
-  (ls : hashmap_List_t t) (key : usize) : hashmap_List_t t =
-  ls
-
-(** [hashmap::HashMap::remove_from_list]: decreases clause *)
-unfold
-let hashmap_HashMap_remove_from_list_loop_decreases (t : Type0) (key : usize)
-  (ls : hashmap_List_t t) : hashmap_List_t t =
-  ls
-
diff --git a/tests/fstar/hashmap_on_disk/HashmapMain.Funs.fst b/tests/fstar/hashmap_on_disk/HashmapMain.Funs.fst
deleted file mode 100644
index 4a032207..00000000
--- a/tests/fstar/hashmap_on_disk/HashmapMain.Funs.fst
+++ /dev/null
@@ -1,446 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [hashmap_main]: function definitions *)
-module HashmapMain.Funs
-open Primitives
-include HashmapMain.Types
-include HashmapMain.FunsExternal
-include HashmapMain.Clauses
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [hashmap_main::hashmap::hash_key]:
-    Source: 'tests/src/hashmap.rs', lines 27:0-27:32 *)
-let hashmap_hash_key (k : usize) : result usize =
-  Ok k
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 50:4-56:5 *)
-let rec hashmap_HashMap_allocate_slots_loop
-  (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t)) (n : usize) :
-  Tot (result (alloc_vec_Vec (hashmap_List_t t)))
-  (decreases (hashmap_HashMap_allocate_slots_loop_decreases t slots n))
-  =
-  if n > 0
-  then
-    let* slots1 = alloc_vec_Vec_push (hashmap_List_t t) slots Hashmap_List_Nil
-      in
-    let* n1 = usize_sub n 1 in
-    hashmap_HashMap_allocate_slots_loop t slots1 n1
-  else Ok slots
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::allocate_slots]:
-    Source: 'tests/src/hashmap.rs', lines 50:4-50:76 *)
-let hashmap_HashMap_allocate_slots
-  (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t)) (n : usize) :
-  result (alloc_vec_Vec (hashmap_List_t t))
-  =
-  hashmap_HashMap_allocate_slots_loop t slots n
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new_with_capacity]:
-    Source: 'tests/src/hashmap.rs', lines 59:4-63:13 *)
-let hashmap_HashMap_new_with_capacity
-  (t : Type0) (capacity : usize) (max_load_dividend : usize)
-  (max_load_divisor : usize) :
-  result (hashmap_HashMap_t t)
-  =
-  let* slots =
-    hashmap_HashMap_allocate_slots t (alloc_vec_Vec_new (hashmap_List_t t))
-      capacity in
-  let* i = usize_mul capacity max_load_dividend in
-  let* i1 = usize_div i max_load_divisor in
-  Ok
-    {
-      num_entries = 0;
-      max_load_factor = (max_load_dividend, max_load_divisor);
-      max_load = i1;
-      slots = slots
-    }
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::new]:
-    Source: 'tests/src/hashmap.rs', lines 75:4-75:24 *)
-let hashmap_HashMap_new (t : Type0) : result (hashmap_HashMap_t t) =
-  hashmap_HashMap_new_with_capacity t 32 4 5
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 80:4-88:5 *)
-let rec hashmap_HashMap_clear_loop
-  (t : Type0) (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) :
-  Tot (result (alloc_vec_Vec (hashmap_List_t t)))
-  (decreases (hashmap_HashMap_clear_loop_decreases t slots i))
-  =
-  let i1 = alloc_vec_Vec_len (hashmap_List_t t) slots in
-  if i < i1
-  then
-    let* (_, index_mut_back) =
-      alloc_vec_Vec_index_mut (hashmap_List_t t) usize
-        (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t)) slots i
-      in
-    let* i2 = usize_add i 1 in
-    let* slots1 = index_mut_back Hashmap_List_Nil in
-    hashmap_HashMap_clear_loop t slots1 i2
-  else Ok slots
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::clear]:
-    Source: 'tests/src/hashmap.rs', lines 80:4-80:27 *)
-let hashmap_HashMap_clear
-  (t : Type0) (self : hashmap_HashMap_t t) : result (hashmap_HashMap_t t) =
-  let* hm = hashmap_HashMap_clear_loop t self.slots 0 in
-  Ok { self with num_entries = 0; slots = hm }
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::len]:
-    Source: 'tests/src/hashmap.rs', lines 90:4-90:30 *)
-let hashmap_HashMap_len
-  (t : Type0) (self : hashmap_HashMap_t t) : result usize =
-  Ok self.num_entries
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 97:4-114:5 *)
-let rec hashmap_HashMap_insert_in_list_loop
-  (t : Type0) (key : usize) (value : t) (ls : hashmap_List_t t) :
-  Tot (result (bool & (hashmap_List_t t)))
-  (decreases (hashmap_HashMap_insert_in_list_loop_decreases t key value ls))
-  =
-  begin match ls with
-  | Hashmap_List_Cons ckey cvalue tl ->
-    if ckey = key
-    then Ok (false, Hashmap_List_Cons ckey value tl)
-    else
-      let* (b, tl1) = hashmap_HashMap_insert_in_list_loop t key value tl in
-      Ok (b, Hashmap_List_Cons ckey cvalue tl1)
-  | Hashmap_List_Nil -> Ok (true, Hashmap_List_Cons key value Hashmap_List_Nil)
-  end
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 97:4-97:71 *)
-let hashmap_HashMap_insert_in_list
-  (t : Type0) (key : usize) (value : t) (ls : hashmap_List_t t) :
-  result (bool & (hashmap_List_t t))
-  =
-  hashmap_HashMap_insert_in_list_loop t key value ls
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert_no_resize]:
-    Source: 'tests/src/hashmap.rs', lines 117:4-117:54 *)
-let hashmap_HashMap_insert_no_resize
-  (t : Type0) (self : hashmap_HashMap_t t) (key : usize) (value : t) :
-  result (hashmap_HashMap_t t)
-  =
-  let* hash = hashmap_hash_key key in
-  let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in
-  let* hash_mod = usize_rem hash i in
-  let* (l, index_mut_back) =
-    alloc_vec_Vec_index_mut (hashmap_List_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t))
-      self.slots hash_mod in
-  let* (inserted, l1) = hashmap_HashMap_insert_in_list t key value l in
-  if inserted
-  then
-    let* i1 = usize_add self.num_entries 1 in
-    let* v = index_mut_back l1 in
-    Ok { self with num_entries = i1; slots = v }
-  else let* v = index_mut_back l1 in Ok { self with slots = v }
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 183:4-196:5 *)
-let rec hashmap_HashMap_move_elements_from_list_loop
-  (t : Type0) (ntable : hashmap_HashMap_t t) (ls : hashmap_List_t t) :
-  Tot (result (hashmap_HashMap_t t))
-  (decreases (
-    hashmap_HashMap_move_elements_from_list_loop_decreases t ntable ls))
-  =
-  begin match ls with
-  | Hashmap_List_Cons k v tl ->
-    let* ntable1 = hashmap_HashMap_insert_no_resize t ntable k v in
-    hashmap_HashMap_move_elements_from_list_loop t ntable1 tl
-  | Hashmap_List_Nil -> Ok ntable
-  end
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements_from_list]:
-    Source: 'tests/src/hashmap.rs', lines 183:4-183:72 *)
-let hashmap_HashMap_move_elements_from_list
-  (t : Type0) (ntable : hashmap_HashMap_t t) (ls : hashmap_List_t t) :
-  result (hashmap_HashMap_t t)
-  =
-  hashmap_HashMap_move_elements_from_list_loop t ntable ls
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 171:4-180:5 *)
-let rec hashmap_HashMap_move_elements_loop
-  (t : Type0) (ntable : hashmap_HashMap_t t)
-  (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) :
-  Tot (result ((hashmap_HashMap_t t) & (alloc_vec_Vec (hashmap_List_t t))))
-  (decreases (hashmap_HashMap_move_elements_loop_decreases t ntable slots i))
-  =
-  let i1 = alloc_vec_Vec_len (hashmap_List_t t) slots in
-  if i < i1
-  then
-    let* (l, index_mut_back) =
-      alloc_vec_Vec_index_mut (hashmap_List_t t) usize
-        (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t)) slots i
-      in
-    let (ls, l1) = core_mem_replace (hashmap_List_t t) l Hashmap_List_Nil in
-    let* ntable1 = hashmap_HashMap_move_elements_from_list t ntable ls in
-    let* i2 = usize_add i 1 in
-    let* slots1 = index_mut_back l1 in
-    hashmap_HashMap_move_elements_loop t ntable1 slots1 i2
-  else Ok (ntable, slots)
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::move_elements]:
-    Source: 'tests/src/hashmap.rs', lines 171:4-171:95 *)
-let hashmap_HashMap_move_elements
-  (t : Type0) (ntable : hashmap_HashMap_t t)
-  (slots : alloc_vec_Vec (hashmap_List_t t)) (i : usize) :
-  result ((hashmap_HashMap_t t) & (alloc_vec_Vec (hashmap_List_t t)))
-  =
-  hashmap_HashMap_move_elements_loop t ntable slots i
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::try_resize]:
-    Source: 'tests/src/hashmap.rs', lines 140:4-140:28 *)
-let hashmap_HashMap_try_resize
-  (t : Type0) (self : hashmap_HashMap_t t) : result (hashmap_HashMap_t t) =
-  let* max_usize = scalar_cast U32 Usize core_u32_max in
-  let capacity = alloc_vec_Vec_len (hashmap_List_t t) self.slots in
-  let* n1 = usize_div max_usize 2 in
-  let (i, i1) = self.max_load_factor in
-  let* i2 = usize_div n1 i in
-  if capacity <= i2
-  then
-    let* i3 = usize_mul capacity 2 in
-    let* ntable = hashmap_HashMap_new_with_capacity t i3 i i1 in
-    let* p = hashmap_HashMap_move_elements t ntable self.slots 0 in
-    let (ntable1, _) = p in
-    Ok
-      { ntable1 with num_entries = self.num_entries; max_load_factor = (i, i1)
-      }
-  else Ok { self with max_load_factor = (i, i1) }
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::insert]:
-    Source: 'tests/src/hashmap.rs', lines 129:4-129:48 *)
-let hashmap_HashMap_insert
-  (t : Type0) (self : hashmap_HashMap_t t) (key : usize) (value : t) :
-  result (hashmap_HashMap_t t)
-  =
-  let* self1 = hashmap_HashMap_insert_no_resize t self key value in
-  let* i = hashmap_HashMap_len t self1 in
-  if i > self1.max_load then hashmap_HashMap_try_resize t self1 else Ok self1
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 206:4-219:5 *)
-let rec hashmap_HashMap_contains_key_in_list_loop
-  (t : Type0) (key : usize) (ls : hashmap_List_t t) :
-  Tot (result bool)
-  (decreases (hashmap_HashMap_contains_key_in_list_loop_decreases t key ls))
-  =
-  begin match ls with
-  | Hashmap_List_Cons ckey _ tl ->
-    if ckey = key
-    then Ok true
-    else hashmap_HashMap_contains_key_in_list_loop t key tl
-  | Hashmap_List_Nil -> Ok false
-  end
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 206:4-206:68 *)
-let hashmap_HashMap_contains_key_in_list
-  (t : Type0) (key : usize) (ls : hashmap_List_t t) : result bool =
-  hashmap_HashMap_contains_key_in_list_loop t key ls
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::contains_key]:
-    Source: 'tests/src/hashmap.rs', lines 199:4-199:49 *)
-let hashmap_HashMap_contains_key
-  (t : Type0) (self : hashmap_HashMap_t t) (key : usize) : result bool =
-  let* hash = hashmap_hash_key key in
-  let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in
-  let* hash_mod = usize_rem hash i in
-  let* l =
-    alloc_vec_Vec_index (hashmap_List_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t))
-      self.slots hash_mod in
-  hashmap_HashMap_contains_key_in_list t key l
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 224:4-237:5 *)
-let rec hashmap_HashMap_get_in_list_loop
-  (t : Type0) (key : usize) (ls : hashmap_List_t t) :
-  Tot (result t)
-  (decreases (hashmap_HashMap_get_in_list_loop_decreases t key ls))
-  =
-  begin match ls with
-  | Hashmap_List_Cons ckey cvalue tl ->
-    if ckey = key then Ok cvalue else hashmap_HashMap_get_in_list_loop t key tl
-  | Hashmap_List_Nil -> Fail Failure
-  end
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 224:4-224:70 *)
-let hashmap_HashMap_get_in_list
-  (t : Type0) (key : usize) (ls : hashmap_List_t t) : result t =
-  hashmap_HashMap_get_in_list_loop t key ls
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get]:
-    Source: 'tests/src/hashmap.rs', lines 239:4-239:55 *)
-let hashmap_HashMap_get
-  (t : Type0) (self : hashmap_HashMap_t t) (key : usize) : result t =
-  let* hash = hashmap_hash_key key in
-  let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in
-  let* hash_mod = usize_rem hash i in
-  let* l =
-    alloc_vec_Vec_index (hashmap_List_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t))
-      self.slots hash_mod in
-  hashmap_HashMap_get_in_list t key l
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 245:4-254:5 *)
-let rec hashmap_HashMap_get_mut_in_list_loop
-  (t : Type0) (ls : hashmap_List_t t) (key : usize) :
-  Tot (result (t & (t -> result (hashmap_List_t t))))
-  (decreases (hashmap_HashMap_get_mut_in_list_loop_decreases t ls key))
-  =
-  begin match ls with
-  | Hashmap_List_Cons ckey cvalue tl ->
-    if ckey = key
-    then
-      let back = fun ret -> Ok (Hashmap_List_Cons ckey ret tl) in
-      Ok (cvalue, back)
-    else
-      let* (x, back) = hashmap_HashMap_get_mut_in_list_loop t tl key in
-      let back1 =
-        fun ret ->
-          let* tl1 = back ret in Ok (Hashmap_List_Cons ckey cvalue tl1) in
-      Ok (x, back1)
-  | Hashmap_List_Nil -> Fail Failure
-  end
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut_in_list]:
-    Source: 'tests/src/hashmap.rs', lines 245:4-245:86 *)
-let hashmap_HashMap_get_mut_in_list
-  (t : Type0) (ls : hashmap_List_t t) (key : usize) :
-  result (t & (t -> result (hashmap_List_t t)))
-  =
-  hashmap_HashMap_get_mut_in_list_loop t ls key
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::get_mut]:
-    Source: 'tests/src/hashmap.rs', lines 257:4-257:67 *)
-let hashmap_HashMap_get_mut
-  (t : Type0) (self : hashmap_HashMap_t t) (key : usize) :
-  result (t & (t -> result (hashmap_HashMap_t t)))
-  =
-  let* hash = hashmap_hash_key key in
-  let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in
-  let* hash_mod = usize_rem hash i in
-  let* (l, index_mut_back) =
-    alloc_vec_Vec_index_mut (hashmap_List_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t))
-      self.slots hash_mod in
-  let* (x, get_mut_in_list_back) = hashmap_HashMap_get_mut_in_list t l key in
-  let back =
-    fun ret ->
-      let* l1 = get_mut_in_list_back ret in
-      let* v = index_mut_back l1 in
-      Ok { self with slots = v } in
-  Ok (x, back)
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]: loop 0:
-    Source: 'tests/src/hashmap.rs', lines 265:4-291:5 *)
-let rec hashmap_HashMap_remove_from_list_loop
-  (t : Type0) (key : usize) (ls : hashmap_List_t t) :
-  Tot (result ((option t) & (hashmap_List_t t)))
-  (decreases (hashmap_HashMap_remove_from_list_loop_decreases t key ls))
-  =
-  begin match ls with
-  | Hashmap_List_Cons ckey x tl ->
-    if ckey = key
-    then
-      let (mv_ls, _) =
-        core_mem_replace (hashmap_List_t t) (Hashmap_List_Cons ckey x tl)
-          Hashmap_List_Nil in
-      begin match mv_ls with
-      | Hashmap_List_Cons _ cvalue tl1 -> Ok (Some cvalue, tl1)
-      | Hashmap_List_Nil -> Fail Failure
-      end
-    else
-      let* (o, tl1) = hashmap_HashMap_remove_from_list_loop t key tl in
-      Ok (o, Hashmap_List_Cons ckey x tl1)
-  | Hashmap_List_Nil -> Ok (None, Hashmap_List_Nil)
-  end
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove_from_list]:
-    Source: 'tests/src/hashmap.rs', lines 265:4-265:69 *)
-let hashmap_HashMap_remove_from_list
-  (t : Type0) (key : usize) (ls : hashmap_List_t t) :
-  result ((option t) & (hashmap_List_t t))
-  =
-  hashmap_HashMap_remove_from_list_loop t key ls
-
-(** [hashmap_main::hashmap::{hashmap_main::hashmap::HashMap<T>}::remove]:
-    Source: 'tests/src/hashmap.rs', lines 294:4-294:52 *)
-let hashmap_HashMap_remove
-  (t : Type0) (self : hashmap_HashMap_t t) (key : usize) :
-  result ((option t) & (hashmap_HashMap_t t))
-  =
-  let* hash = hashmap_hash_key key in
-  let i = alloc_vec_Vec_len (hashmap_List_t t) self.slots in
-  let* hash_mod = usize_rem hash i in
-  let* (l, index_mut_back) =
-    alloc_vec_Vec_index_mut (hashmap_List_t t) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (hashmap_List_t t))
-      self.slots hash_mod in
-  let* (x, l1) = hashmap_HashMap_remove_from_list t key l in
-  begin match x with
-  | None -> let* v = index_mut_back l1 in Ok (None, { self with slots = v })
-  | Some x1 ->
-    let* i1 = usize_sub self.num_entries 1 in
-    let* v = index_mut_back l1 in
-    Ok (Some x1, { self with num_entries = i1; slots = v })
-  end
-
-(** [hashmap_main::hashmap::test1]:
-    Source: 'tests/src/hashmap.rs', lines 315:0-315:10 *)
-let hashmap_test1 : result unit =
-  let* hm = hashmap_HashMap_new u64 in
-  let* hm1 = hashmap_HashMap_insert u64 hm 0 42 in
-  let* hm2 = hashmap_HashMap_insert u64 hm1 128 18 in
-  let* hm3 = hashmap_HashMap_insert u64 hm2 1024 138 in
-  let* hm4 = hashmap_HashMap_insert u64 hm3 1056 256 in
-  let* i = hashmap_HashMap_get u64 hm4 128 in
-  if not (i = 18)
-  then Fail Failure
-  else
-    let* (_, get_mut_back) = hashmap_HashMap_get_mut u64 hm4 1024 in
-    let* hm5 = get_mut_back 56 in
-    let* i1 = hashmap_HashMap_get u64 hm5 1024 in
-    if not (i1 = 56)
-    then Fail Failure
-    else
-      let* (x, hm6) = hashmap_HashMap_remove u64 hm5 1024 in
-      begin match x with
-      | None -> Fail Failure
-      | Some x1 ->
-        if not (x1 = 56)
-        then Fail Failure
-        else
-          let* i2 = hashmap_HashMap_get u64 hm6 0 in
-          if not (i2 = 42)
-          then Fail Failure
-          else
-            let* i3 = hashmap_HashMap_get u64 hm6 128 in
-            if not (i3 = 18)
-            then Fail Failure
-            else
-              let* i4 = hashmap_HashMap_get u64 hm6 1056 in
-              if not (i4 = 256) then Fail Failure else Ok ()
-      end
-
-(** [hashmap_main::insert_on_disk]:
-    Source: 'tests/src/hashmap_main.rs', lines 7:0-7:43 *)
-let insert_on_disk
-  (key : usize) (value : u64) (st : state) : result (state & unit) =
-  let* (st1, hm) = hashmap_utils_deserialize st in
-  let* hm1 = hashmap_HashMap_insert u64 hm key value in
-  hashmap_utils_serialize hm1 st1
-
-(** [hashmap_main::main]:
-    Source: 'tests/src/hashmap_main.rs', lines 16:0-16:13 *)
-let main : result unit =
-  Ok ()
-
diff --git a/tests/fstar/hashmap_on_disk/HashmapMain.FunsExternal.fsti b/tests/fstar/hashmap_on_disk/HashmapMain.FunsExternal.fsti
deleted file mode 100644
index 3afc4689..00000000
--- a/tests/fstar/hashmap_on_disk/HashmapMain.FunsExternal.fsti
+++ /dev/null
@@ -1,18 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [hashmap_main]: external function declarations *)
-module HashmapMain.FunsExternal
-open Primitives
-include HashmapMain.Types
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [hashmap_main::hashmap_utils::deserialize]:
-    Source: 'tests/src/hashmap_utils.rs', lines 10:0-10:43 *)
-val hashmap_utils_deserialize
-  : state -> result (state & (hashmap_HashMap_t u64))
-
-(** [hashmap_main::hashmap_utils::serialize]:
-    Source: 'tests/src/hashmap_utils.rs', lines 5:0-5:42 *)
-val hashmap_utils_serialize
-  : hashmap_HashMap_t u64 -> state -> result (state & unit)
-
diff --git a/tests/fstar/hashmap_on_disk/HashmapMain.Types.fst b/tests/fstar/hashmap_on_disk/HashmapMain.Types.fst
deleted file mode 100644
index 21d32541..00000000
--- a/tests/fstar/hashmap_on_disk/HashmapMain.Types.fst
+++ /dev/null
@@ -1,24 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [hashmap_main]: type definitions *)
-module HashmapMain.Types
-open Primitives
-include HashmapMain.TypesExternal
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [hashmap_main::hashmap::List]
-    Source: 'tests/src/hashmap.rs', lines 19:0-19:16 *)
-type hashmap_List_t (t : Type0) =
-| Hashmap_List_Cons : usize -> t -> hashmap_List_t t -> hashmap_List_t t
-| Hashmap_List_Nil : hashmap_List_t t
-
-(** [hashmap_main::hashmap::HashMap]
-    Source: 'tests/src/hashmap.rs', lines 35:0-35:21 *)
-type hashmap_HashMap_t (t : Type0) =
-{
-  num_entries : usize;
-  max_load_factor : (usize & usize);
-  max_load : usize;
-  slots : alloc_vec_Vec (hashmap_List_t t);
-}
-
diff --git a/tests/fstar/hashmap_on_disk/Makefile b/tests/fstar/hashmap_on_disk/Makefile
deleted file mode 100644
index fa7d1f36..00000000
--- a/tests/fstar/hashmap_on_disk/Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
-# This file was automatically generated - modify ../Makefile.template instead
-INCLUDE_DIRS = .
-
-FSTAR_INCLUDES = $(addprefix --include ,$(INCLUDE_DIRS))
-
-FSTAR_HINTS ?= --use_hints --use_hint_hashes --record_hints
-
-FSTAR_OPTIONS = $(FSTAR_HINTS) \
-  --cache_checked_modules $(FSTAR_INCLUDES) --cmi \
-  --warn_error '+241@247+285-274' \
-
-FSTAR_EXE ?= fstar.exe
-FSTAR_NO_FLAGS = $(FSTAR_EXE) --already_cached 'Prims FStar LowStar Steel' --odir obj --cache_dir obj
-
-FSTAR = $(FSTAR_NO_FLAGS) $(FSTAR_OPTIONS)
-
-# The F* roots are used to compute the dependency graph, and generate the .depend file
-FSTAR_ROOTS ?= $(wildcard *.fst *.fsti)
-
-# Build all the files
-all: $(addprefix obj/,$(addsuffix .checked,$(FSTAR_ROOTS)))
-
-# This is the right way to ensure the .depend file always gets re-built.
-ifeq (,$(filter %-in,$(MAKECMDGOALS)))
-ifndef NODEPEND
-ifndef MAKE_RESTARTS
-.depend: .FORCE
-	$(FSTAR_NO_FLAGS) --dep full $(notdir $(FSTAR_ROOTS)) > $@
-
-.PHONY: .FORCE
-.FORCE:
-endif
-endif
-
-include .depend
-endif
-
-# For the interactive mode
-%.fst-in %.fsti-in:
-	@echo $(FSTAR_OPTIONS)
-
-# Generete the .checked files in batch mode
-%.checked:
-	$(FSTAR) $(FSTAR_OPTIONS) $< && \
-	touch -c $@
-
-.PHONY: clean
-clean:
-	rm -f obj/*
diff --git a/tests/fstar/hashmap_on_disk/Primitives.fst b/tests/fstar/hashmap_on_disk/Primitives.fst
deleted file mode 100644
index 9951ccc3..00000000
--- a/tests/fstar/hashmap_on_disk/Primitives.fst
+++ /dev/null
@@ -1,929 +0,0 @@
-/// This file lists primitive and assumed functions and types
-module Primitives
-open FStar.Mul
-open FStar.List.Tot
-
-#set-options "--z3rlimit 15 --fuel 0 --ifuel 1"
-
-(*** Utilities *)
-val list_update (#a : Type0) (ls : list a) (i : nat{i < length ls}) (x : a) :
-  ls':list a{
-    length ls' = length ls /\
-    index ls' i == x
-  }
-#push-options "--fuel 1"
-let rec list_update #a ls i x =
-  match ls with
-  | x' :: ls -> if i = 0 then x :: ls else x' :: list_update ls (i-1) x
-#pop-options
-
-(*** Result *)
-type error : Type0 =
-| Failure
-| OutOfFuel
-
-type result (a : Type0) : Type0 =
-| Ok : v:a -> result a
-| Fail : e:error -> result a
-
-// Monadic return operator
-unfold let return (#a : Type0) (x : a) : result a = Ok x
-
-// Monadic bind operator.
-// Allows to use the notation:
-// ```
-// let* x = y in
-// ...
-// ```
-unfold let (let*) (#a #b : Type0) (m: result a)
-  (f: (x:a) -> Pure (result b) (requires (m == Ok x)) (ensures fun _ -> True)) :
-  result b =
-  match m with
-  | Ok x -> f x
-  | Fail e   -> Fail e
-
-// Monadic assert(...)
-let massert (b:bool) : result unit = if b then Ok () else Fail Failure
-
-// Normalize and unwrap a successful result (used for globals).
-let eval_global (#a : Type0) (x : result a{Ok? (normalize_term x)}) : a = Ok?.v x
-
-(*** Misc *)
-type char = FStar.Char.char
-type string = string
-
-let is_zero (n: nat) : bool = n = 0
-let decrease (n: nat{n > 0}) : nat = n - 1
-
-let core_mem_replace (a : Type0) (x : a) (y : a) : a & a = (x, x)
-
-// We don't really use raw pointers for now
-type mut_raw_ptr (t : Type0) = { v : t }
-type const_raw_ptr (t : Type0) = { v : t }
-
-(*** Scalars *)
-/// Rem.: most of the following code was partially generated
-
-assume val size_numbits : pos
-
-// TODO: we could use FStar.Int.int_t and FStar.UInt.int_t
-
-let isize_min : int = -9223372036854775808 // TODO: should be opaque
-let isize_max : int = 9223372036854775807 // TODO: should be opaque
-let i8_min : int = -128
-let i8_max : int = 127
-let i16_min : int = -32768
-let i16_max : int = 32767
-let i32_min : int = -2147483648
-let i32_max : int = 2147483647
-let i64_min : int = -9223372036854775808
-let i64_max : int = 9223372036854775807
-let i128_min : int = -170141183460469231731687303715884105728
-let i128_max : int = 170141183460469231731687303715884105727
-let usize_min : int = 0
-let usize_max : int = 4294967295 // TODO: should be opaque
-let u8_min : int = 0
-let u8_max : int = 255
-let u16_min : int = 0
-let u16_max : int = 65535
-let u32_min : int = 0
-let u32_max : int = 4294967295
-let u64_min : int = 0
-let u64_max : int = 18446744073709551615
-let u128_min : int = 0
-let u128_max : int = 340282366920938463463374607431768211455
-
-type scalar_ty =
-| Isize
-| I8
-| I16
-| I32
-| I64
-| I128
-| Usize
-| U8
-| U16
-| U32
-| U64
-| U128
-
-let is_unsigned = function
-  | Isize | I8 | I16 | I32 | I64 | I128 -> false
-  | Usize | U8 | U16 | U32 | U64 | U128 -> true
-
-let scalar_min (ty : scalar_ty) : int =
-  match ty with
-  | Isize -> isize_min
-  | I8 -> i8_min
-  | I16 -> i16_min
-  | I32 -> i32_min
-  | I64 -> i64_min
-  | I128 -> i128_min
-  | Usize -> usize_min
-  | U8 -> u8_min
-  | U16 -> u16_min
-  | U32 -> u32_min
-  | U64 -> u64_min
-  | U128 -> u128_min
-
-let scalar_max (ty : scalar_ty) : int =
-  match ty with
-  | Isize -> isize_max
-  | I8 -> i8_max
-  | I16 -> i16_max
-  | I32 -> i32_max
-  | I64 -> i64_max
-  | I128 -> i128_max
-  | Usize -> usize_max
-  | U8 -> u8_max
-  | U16 -> u16_max
-  | U32 -> u32_max
-  | U64 -> u64_max
-  | U128 -> u128_max
-
-type scalar (ty : scalar_ty) : eqtype = x:int{scalar_min ty <= x && x <= scalar_max ty}
-
-let mk_scalar (ty : scalar_ty) (x : int) : result (scalar ty) =
-  if scalar_min ty <= x && scalar_max ty >= x then Ok x else Fail Failure
-
-let scalar_neg (#ty : scalar_ty) (x : scalar ty) : result (scalar ty) = mk_scalar ty (-x)
-
-let scalar_div (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) =
-  if y <> 0 then mk_scalar ty (x / y) else Fail Failure
-
-/// The remainder operation
-let int_rem (x : int) (y : int{y <> 0}) : int =
-  if x >= 0 then (x % y) else -(x % y)
-
-(* Checking consistency with Rust *)
-let _ = assert_norm(int_rem 1 2 = 1)
-let _ = assert_norm(int_rem (-1) 2 = -1)
-let _ = assert_norm(int_rem 1 (-2) = 1)
-let _ = assert_norm(int_rem (-1) (-2) = -1)
-
-let scalar_rem (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) =
-  if y <> 0 then mk_scalar ty (int_rem x y) else Fail Failure
-
-let scalar_add (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) =
-  mk_scalar ty (x + y)
-
-let scalar_sub (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) =
-  mk_scalar ty (x - y)
-
-let scalar_mul (#ty : scalar_ty) (x : scalar ty) (y : scalar ty) : result (scalar ty) =
-  mk_scalar ty (x * y)
-
-let scalar_xor (#ty : scalar_ty)
-    (x : scalar ty) (y : scalar ty) : scalar ty =
-  match ty with
-  | U8 -> FStar.UInt.logxor #8 x y
-  | U16 -> FStar.UInt.logxor #16 x y
-  | U32 -> FStar.UInt.logxor #32 x y
-  | U64 -> FStar.UInt.logxor #64 x y
-  | U128 -> FStar.UInt.logxor #128 x y
-  | Usize -> admit() // TODO
-  | I8 ->
-    // Encoding issues...
-    normalize_spec (FStar.Int.int_t 8);
-    normalize_spec (scalar I8);
-    FStar.Int.logxor #8 x y
-  | I16 ->
-    // Encoding issues...
-    normalize_spec (FStar.Int.int_t 16);
-    normalize_spec (scalar I16);
-    FStar.Int.logxor #16 x y
-  | I32 -> FStar.Int.logxor #32 x y
-  | I64 -> FStar.Int.logxor #64 x y
-  | I128 ->
-    // Encoding issues...
-    normalize_spec (FStar.Int.int_t 128);
-    normalize_spec (scalar I128);
-    FStar.Int.logxor #128 x y
-  | Isize -> admit() // TODO
-
-let scalar_or (#ty : scalar_ty)
-    (x : scalar ty) (y : scalar ty) : scalar ty =
-  match ty with
-  | U8 -> FStar.UInt.logor #8 x y
-  | U16 -> FStar.UInt.logor #16 x y
-  | U32 -> FStar.UInt.logor #32 x y
-  | U64 -> FStar.UInt.logor #64 x y
-  | U128 -> FStar.UInt.logor #128 x y
-  | Usize -> admit() // TODO
-  | I8 ->
-    // Encoding issues...
-    normalize_spec (FStar.Int.int_t 8);
-    normalize_spec (scalar I8);
-    FStar.Int.logor #8 x y
-  | I16 ->
-    // Encoding issues...
-    normalize_spec (FStar.Int.int_t 16);
-    normalize_spec (scalar I16);
-    FStar.Int.logor #16 x y
-  | I32 -> FStar.Int.logor #32 x y
-  | I64 -> FStar.Int.logor #64 x y
-  | I128 ->
-    // Encoding issues...
-    normalize_spec (FStar.Int.int_t 128);
-    normalize_spec (scalar I128);
-    FStar.Int.logor #128 x y
-  | Isize -> admit() // TODO
-
-let scalar_and (#ty : scalar_ty)
-    (x : scalar ty) (y : scalar ty) : scalar ty =
-  match ty with
-  | U8 -> FStar.UInt.logand #8 x y
-  | U16 -> FStar.UInt.logand #16 x y
-  | U32 -> FStar.UInt.logand #32 x y
-  | U64 -> FStar.UInt.logand #64 x y
-  | U128 -> FStar.UInt.logand #128 x y
-  | Usize -> admit() // TODO
-  | I8 ->
-    // Encoding issues...
-    normalize_spec (FStar.Int.int_t 8);
-    normalize_spec (scalar I8);
-    FStar.Int.logand #8 x y
-  | I16 ->
-    // Encoding issues...
-    normalize_spec (FStar.Int.int_t 16);
-    normalize_spec (scalar I16);
-    FStar.Int.logand #16 x y
-  | I32 -> FStar.Int.logand #32 x y
-  | I64 -> FStar.Int.logand #64 x y
-  | I128 ->
-    // Encoding issues...
-    normalize_spec (FStar.Int.int_t 128);
-    normalize_spec (scalar I128);
-    FStar.Int.logand #128 x y
-  | Isize -> admit() // TODO
-
-// Shift left
-let scalar_shl (#ty0 #ty1 : scalar_ty)
-    (x : scalar ty0) (y : scalar ty1) : result (scalar ty0) =
-  admit()
-
-// Shift right
-let scalar_shr (#ty0 #ty1 : scalar_ty)
-    (x : scalar ty0) (y : scalar ty1) : result (scalar ty0) =
-  admit()
-
-(** Cast an integer from a [src_ty] to a [tgt_ty] *)
-// TODO: check the semantics of casts in Rust
-let scalar_cast (src_ty : scalar_ty) (tgt_ty : scalar_ty) (x : scalar src_ty) : result (scalar tgt_ty) =
-  mk_scalar tgt_ty x
-
-// This can't fail, but for now we make all casts faillible (easier for the translation)
-let scalar_cast_bool (tgt_ty : scalar_ty) (x : bool) : result (scalar tgt_ty) =
-  mk_scalar tgt_ty (if x then 1 else 0)
-
-/// The scalar types
-type isize : eqtype = scalar Isize
-type i8    : eqtype = scalar I8
-type i16   : eqtype = scalar I16
-type i32   : eqtype = scalar I32
-type i64   : eqtype = scalar I64
-type i128  : eqtype = scalar I128
-type usize : eqtype = scalar Usize
-type u8    : eqtype = scalar U8
-type u16   : eqtype = scalar U16
-type u32   : eqtype = scalar U32
-type u64   : eqtype = scalar U64
-type u128  : eqtype = scalar U128
-
-
-let core_isize_min : isize = isize_min
-let core_isize_max : isize = isize_max
-let core_i8_min    : i8 = i8_min
-let core_i8_max    : i8 = i8_max
-let core_i16_min   : i16 = i16_min
-let core_i16_max   : i16 = i16_max
-let core_i32_min   : i32 = i32_min
-let core_i32_max   : i32 = i32_max
-let core_i64_min   : i64 = i64_min
-let core_i64_max   : i64 = i64_max
-let core_i128_min  : i128 = i128_min
-let core_i128_max  : i128 = i128_max
-
-let core_usize_min : usize = usize_min
-let core_usize_max : usize = usize_max
-let core_u8_min    : u8 = u8_min
-let core_u8_max    : u8 = u8_max
-let core_u16_min   : u16 = u16_min
-let core_u16_max   : u16 = u16_max
-let core_u32_min   : u32 = u32_min
-let core_u32_max   : u32 = u32_max
-let core_u64_min   : u64 = u64_min
-let core_u64_max   : u64 = u64_max
-let core_u128_min  : u128 = u128_min
-let core_u128_max  : u128 = u128_max
-
-/// Negation
-let isize_neg = scalar_neg #Isize
-let i8_neg = scalar_neg #I8
-let i16_neg = scalar_neg #I16
-let i32_neg = scalar_neg #I32
-let i64_neg = scalar_neg #I64
-let i128_neg = scalar_neg #I128
-
-/// Division
-let isize_div = scalar_div #Isize
-let i8_div = scalar_div #I8
-let i16_div = scalar_div #I16
-let i32_div = scalar_div #I32
-let i64_div = scalar_div #I64
-let i128_div = scalar_div #I128
-let usize_div = scalar_div #Usize
-let u8_div = scalar_div #U8
-let u16_div = scalar_div #U16
-let u32_div = scalar_div #U32
-let u64_div = scalar_div #U64
-let u128_div = scalar_div #U128
-
-/// Remainder
-let isize_rem = scalar_rem #Isize
-let i8_rem = scalar_rem #I8
-let i16_rem = scalar_rem #I16
-let i32_rem = scalar_rem #I32
-let i64_rem = scalar_rem #I64
-let i128_rem = scalar_rem #I128
-let usize_rem = scalar_rem #Usize
-let u8_rem = scalar_rem #U8
-let u16_rem = scalar_rem #U16
-let u32_rem = scalar_rem #U32
-let u64_rem = scalar_rem #U64
-let u128_rem = scalar_rem #U128
-
-/// Addition
-let isize_add = scalar_add #Isize
-let i8_add = scalar_add #I8
-let i16_add = scalar_add #I16
-let i32_add = scalar_add #I32
-let i64_add = scalar_add #I64
-let i128_add = scalar_add #I128
-let usize_add = scalar_add #Usize
-let u8_add = scalar_add #U8
-let u16_add = scalar_add #U16
-let u32_add = scalar_add #U32
-let u64_add = scalar_add #U64
-let u128_add = scalar_add #U128
-
-/// Subtraction
-let isize_sub = scalar_sub #Isize
-let i8_sub = scalar_sub #I8
-let i16_sub = scalar_sub #I16
-let i32_sub = scalar_sub #I32
-let i64_sub = scalar_sub #I64
-let i128_sub = scalar_sub #I128
-let usize_sub = scalar_sub #Usize
-let u8_sub = scalar_sub #U8
-let u16_sub = scalar_sub #U16
-let u32_sub = scalar_sub #U32
-let u64_sub = scalar_sub #U64
-let u128_sub = scalar_sub #U128
-
-/// Multiplication
-let isize_mul = scalar_mul #Isize
-let i8_mul = scalar_mul #I8
-let i16_mul = scalar_mul #I16
-let i32_mul = scalar_mul #I32
-let i64_mul = scalar_mul #I64
-let i128_mul = scalar_mul #I128
-let usize_mul = scalar_mul #Usize
-let u8_mul = scalar_mul #U8
-let u16_mul = scalar_mul #U16
-let u32_mul = scalar_mul #U32
-let u64_mul = scalar_mul #U64
-let u128_mul = scalar_mul #U128
-
-/// Xor
-let u8_xor = scalar_xor #U8
-let u16_xor = scalar_xor #U16
-let u32_xor = scalar_xor #U32
-let u64_xor = scalar_xor #U64
-let u128_xor = scalar_xor #U128
-let usize_xor = scalar_xor #Usize
-let i8_xor = scalar_xor #I8
-let i16_xor = scalar_xor #I16
-let i32_xor = scalar_xor #I32
-let i64_xor = scalar_xor #I64
-let i128_xor = scalar_xor #I128
-let isize_xor = scalar_xor #Isize
-
-/// Or
-let u8_or = scalar_or #U8
-let u16_or = scalar_or #U16
-let u32_or = scalar_or #U32
-let u64_or = scalar_or #U64
-let u128_or = scalar_or #U128
-let usize_or = scalar_or #Usize
-let i8_or = scalar_or #I8
-let i16_or = scalar_or #I16
-let i32_or = scalar_or #I32
-let i64_or = scalar_or #I64
-let i128_or = scalar_or #I128
-let isize_or = scalar_or #Isize
-
-/// And
-let u8_and = scalar_and #U8
-let u16_and = scalar_and #U16
-let u32_and = scalar_and #U32
-let u64_and = scalar_and #U64
-let u128_and = scalar_and #U128
-let usize_and = scalar_and #Usize
-let i8_and = scalar_and #I8
-let i16_and = scalar_and #I16
-let i32_and = scalar_and #I32
-let i64_and = scalar_and #I64
-let i128_and = scalar_and #I128
-let isize_and = scalar_and #Isize
-
-/// Shift left
-let u8_shl #ty = scalar_shl #U8 #ty
-let u16_shl #ty = scalar_shl #U16 #ty
-let u32_shl #ty = scalar_shl #U32 #ty
-let u64_shl #ty = scalar_shl #U64 #ty
-let u128_shl #ty = scalar_shl #U128 #ty
-let usize_shl #ty = scalar_shl #Usize #ty
-let i8_shl #ty = scalar_shl #I8 #ty
-let i16_shl #ty = scalar_shl #I16 #ty
-let i32_shl #ty = scalar_shl #I32 #ty
-let i64_shl #ty = scalar_shl #I64 #ty
-let i128_shl #ty = scalar_shl #I128 #ty
-let isize_shl #ty = scalar_shl #Isize #ty
-
-/// Shift right
-let u8_shr #ty = scalar_shr #U8 #ty
-let u16_shr #ty = scalar_shr #U16 #ty
-let u32_shr #ty = scalar_shr #U32 #ty
-let u64_shr #ty = scalar_shr #U64 #ty
-let u128_shr #ty = scalar_shr #U128 #ty
-let usize_shr #ty = scalar_shr #Usize #ty
-let i8_shr #ty = scalar_shr #I8 #ty
-let i16_shr #ty = scalar_shr #I16 #ty
-let i32_shr #ty = scalar_shr #I32 #ty
-let i64_shr #ty = scalar_shr #I64 #ty
-let i128_shr #ty = scalar_shr #I128 #ty
-let isize_shr #ty = scalar_shr #Isize #ty
-
-(*** core *)
-
-/// Trait declaration: [core::clone::Clone]
-noeq type core_clone_Clone (self : Type0) = {
-  clone : self → result self
-}
-
-let core_clone_impls_CloneBool_clone (b : bool) : bool = b
-
-let core_clone_CloneBool : core_clone_Clone bool = {
-  clone = fun b -> Ok (core_clone_impls_CloneBool_clone b)
-}
-
-let core_clone_impls_CloneUsize_clone (x : usize) : usize = x
-let core_clone_impls_CloneU8_clone (x : u8) : u8 = x
-let core_clone_impls_CloneU16_clone (x : u16) : u16 = x
-let core_clone_impls_CloneU32_clone (x : u32) : u32 = x
-let core_clone_impls_CloneU64_clone (x : u64) : u64 = x
-let core_clone_impls_CloneU128_clone (x : u128) : u128 = x
-
-let core_clone_impls_CloneIsize_clone (x : isize) : isize = x
-let core_clone_impls_CloneI8_clone (x : i8) : i8 = x
-let core_clone_impls_CloneI16_clone (x : i16) : i16 = x
-let core_clone_impls_CloneI32_clone (x : i32) : i32 = x
-let core_clone_impls_CloneI64_clone (x : i64) : i64 = x
-let core_clone_impls_CloneI128_clone (x : i128) : i128 = x
-
-let core_clone_CloneUsize : core_clone_Clone usize = {
-  clone = fun x -> Ok (core_clone_impls_CloneUsize_clone x)
-}
-
-let core_clone_CloneU8 : core_clone_Clone u8 = {
-  clone = fun x -> Ok (core_clone_impls_CloneU8_clone x)
-}
-
-let core_clone_CloneU16 : core_clone_Clone u16 = {
-  clone = fun x -> Ok (core_clone_impls_CloneU16_clone x)
-}
-
-let core_clone_CloneU32 : core_clone_Clone u32 = {
-  clone = fun x -> Ok (core_clone_impls_CloneU32_clone x)
-}
-
-let core_clone_CloneU64 : core_clone_Clone u64 = {
-  clone = fun x -> Ok (core_clone_impls_CloneU64_clone x)
-}
-
-let core_clone_CloneU128 : core_clone_Clone u128 = {
-  clone = fun x -> Ok (core_clone_impls_CloneU128_clone x)
-}
-
-let core_clone_CloneIsize : core_clone_Clone isize = {
-  clone = fun x -> Ok (core_clone_impls_CloneIsize_clone x)
-}
-
-let core_clone_CloneI8 : core_clone_Clone i8 = {
-  clone = fun x -> Ok (core_clone_impls_CloneI8_clone x)
-}
-
-let core_clone_CloneI16 : core_clone_Clone i16 = {
-  clone = fun x -> Ok (core_clone_impls_CloneI16_clone x)
-}
-
-let core_clone_CloneI32 : core_clone_Clone i32 = {
-  clone = fun x -> Ok (core_clone_impls_CloneI32_clone x)
-}
-
-let core_clone_CloneI64 : core_clone_Clone i64 = {
-  clone = fun x -> Ok (core_clone_impls_CloneI64_clone x)
-}
-
-let core_clone_CloneI128 : core_clone_Clone i128 = {
-  clone = fun x -> Ok (core_clone_impls_CloneI128_clone x)
-}
-
-(** [core::option::{core::option::Option<T>}::unwrap] *)
-let core_option_Option_unwrap (t : Type0) (x : option t) : result t =
-  match x with
-  | None -> Fail Failure
-  | Some x -> Ok x
-
-(*** core::ops *)
-
-// Trait declaration: [core::ops::index::Index]
-noeq type core_ops_index_Index (self idx : Type0) = {
-  output : Type0;
-  index : self → idx → result output
-}
-
-// Trait declaration: [core::ops::index::IndexMut]
-noeq type core_ops_index_IndexMut (self idx : Type0) = {
-  indexInst : core_ops_index_Index self idx;
-  index_mut : self → idx → result (indexInst.output & (indexInst.output → result self));
-}
-
-// Trait declaration [core::ops::deref::Deref]
-noeq type core_ops_deref_Deref (self : Type0) = {
-  target : Type0;
-  deref : self → result target;
-}
-
-// Trait declaration [core::ops::deref::DerefMut]
-noeq type core_ops_deref_DerefMut (self : Type0) = {
-  derefInst : core_ops_deref_Deref self;
-  deref_mut : self → result (derefInst.target & (derefInst.target → result self));
-}
-
-type core_ops_range_Range (a : Type0) = {
-  start : a;
-  end_ : a;
-}
-
-(*** [alloc] *)
-
-let alloc_boxed_Box_deref (t : Type0) (x : t) : result t = Ok x
-let alloc_boxed_Box_deref_mut (t : Type0) (x : t) : result (t & (t -> result t)) =
-  Ok (x, (fun x -> Ok x))
-
-// Trait instance
-let alloc_boxed_Box_coreopsDerefInst (self : Type0) : core_ops_deref_Deref self = {
-  target = self;
-  deref = alloc_boxed_Box_deref self;
-}
-
-// Trait instance
-let alloc_boxed_Box_coreopsDerefMutInst (self : Type0) : core_ops_deref_DerefMut self = {
-  derefInst = alloc_boxed_Box_coreopsDerefInst self;
-  deref_mut = alloc_boxed_Box_deref_mut self;
-}
-
-(*** Array *)
-type array (a : Type0) (n : usize) = s:list a{length s = n}
-
-// We tried putting the normalize_term condition as a refinement on the list
-// but it didn't work. It works with the requires clause.
-let mk_array (a : Type0) (n : usize)
-  (l : list a) :
-  Pure (array a n)
-  (requires (normalize_term(FStar.List.Tot.length l) = n))
-  (ensures (fun _ -> True)) =
-  normalize_term_spec (FStar.List.Tot.length l);
-  l
-
-let array_index_usize (a : Type0) (n : usize) (x : array a n) (i : usize) : result a =
-  if i < length x then Ok (index x i)
-  else Fail Failure
-
-let array_update_usize (a : Type0) (n : usize) (x : array a n) (i : usize) (nx : a) :
-  result (array a n) =
-  if i < length x then Ok (list_update x i nx)
-  else Fail Failure
-
-let array_index_mut_usize (a : Type0) (n : usize) (x : array a n) (i : usize) :
-  result (a & (a -> result (array a n))) =
-  match array_index_usize a n x i with
-  | Fail e -> Fail e
-  | Ok v ->
-    Ok (v, array_update_usize a n x i)
-
-(*** Slice *)
-type slice (a : Type0) = s:list a{length s <= usize_max}
-
-let slice_len (a : Type0) (s : slice a) : usize = length s
-
-let slice_index_usize (a : Type0) (x : slice a) (i : usize) : result a =
-  if i < length x then Ok (index x i)
-  else Fail Failure
-
-let slice_update_usize (a : Type0) (x : slice a) (i : usize) (nx : a) : result (slice a) =
-  if i < length x then Ok (list_update x i nx)
-  else Fail Failure
-
-let slice_index_mut_usize (a : Type0) (s : slice a) (i : usize) :
-  result (a & (a -> result (slice a))) =
-  match slice_index_usize a s i with
-  | Fail e -> Fail e
-  | Ok x ->
-    Ok (x, slice_update_usize a s i)
-
-(*** Subslices *)
-
-let array_to_slice (a : Type0) (n : usize) (x : array a n) : result (slice a) = Ok x
-let array_from_slice (a : Type0) (n : usize) (x : array a n) (s : slice a) : result (array a n) =
-  if length s = n then Ok s
-  else Fail Failure
-
-let array_to_slice_mut (a : Type0) (n : usize) (x : array a n) :
-  result (slice a & (slice a -> result (array a n))) =
-  Ok (x, array_from_slice a n x)
-
-// TODO: finish the definitions below (there lacks [List.drop] and [List.take] in the standard library *)
-let array_subslice (a : Type0) (n : usize) (x : array a n) (r : core_ops_range_Range usize) : result (slice a) =
-  admit()
-
-let array_update_subslice (a : Type0) (n : usize) (x : array a n) (r : core_ops_range_Range usize) (ns : slice a) : result (array a n) =
-  admit()
-
-let array_repeat (a : Type0) (n : usize) (x : a) : array a n =
-  admit()
-
-let slice_subslice (a : Type0) (x : slice a) (r : core_ops_range_Range usize) : result (slice a) =
-  admit()
-
-let slice_update_subslice (a : Type0) (x : slice a) (r : core_ops_range_Range usize) (ns : slice a) : result (slice a) =
-  admit()
-
-(*** Vector *)
-type alloc_vec_Vec (a : Type0) = v:list a{length v <= usize_max}
-
-let alloc_vec_Vec_new (a  : Type0) : alloc_vec_Vec a = assert_norm(length #a [] == 0); []
-let alloc_vec_Vec_len (a : Type0) (v : alloc_vec_Vec a) : usize = length v
-
-// Helper
-let alloc_vec_Vec_index_usize (#a : Type0) (v : alloc_vec_Vec a) (i : usize) : result a =
-  if i < length v then Ok (index v i) else Fail Failure
-// Helper
-let alloc_vec_Vec_update_usize (#a : Type0) (v : alloc_vec_Vec a) (i : usize) (x : a) : result (alloc_vec_Vec a) =
-  if i < length v then Ok (list_update v i x) else Fail Failure
-
-let alloc_vec_Vec_index_mut_usize (#a : Type0) (v: alloc_vec_Vec a) (i: usize) :
-  result (a & (a → result (alloc_vec_Vec a))) =
-  match alloc_vec_Vec_index_usize v i with
-  | Ok x ->
-    Ok (x, alloc_vec_Vec_update_usize v i)
-  | Fail e -> Fail e
-
-let alloc_vec_Vec_push (a  : Type0) (v : alloc_vec_Vec a) (x : a) :
-  Pure (result (alloc_vec_Vec a))
-  (requires True)
-  (ensures (fun res ->
-    match res with
-    | Fail e -> e == Failure
-    | Ok v' -> length v' = length v + 1)) =
-  if length v < usize_max then begin
-    (**) assert_norm(length [x] == 1);
-    (**) append_length v [x];
-    (**) assert(length (append v [x]) = length v + 1);
-    Ok (append v [x])
-    end
-  else Fail Failure
-
-let alloc_vec_Vec_insert (a : Type0) (v : alloc_vec_Vec a) (i : usize) (x : a) : result (alloc_vec_Vec a) =
-  if i < length v then Ok (list_update v i x) else Fail Failure
-
-// Trait declaration: [core::slice::index::private_slice_index::Sealed]
-type core_slice_index_private_slice_index_Sealed (self : Type0) = unit
-
-// Trait declaration: [core::slice::index::SliceIndex]
-noeq type core_slice_index_SliceIndex (self t : Type0) = {
-  sealedInst : core_slice_index_private_slice_index_Sealed self;
-  output : Type0;
-  get : self → t → result (option output);
-  get_mut : self → t → result (option output & (option output -> result t));
-  get_unchecked : self → const_raw_ptr t → result (const_raw_ptr output);
-  get_unchecked_mut : self → mut_raw_ptr t → result (mut_raw_ptr output);
-  index : self → t → result output;
-  index_mut : self → t → result (output & (output -> result t));
-}
-
-// [core::slice::index::[T]::index]: forward function
-let core_slice_index_Slice_index
-  (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t))
-  (s : slice t) (i : idx) : result inst.output =
-  let* x = inst.get i s in
-  match x with
-  | None -> Fail Failure
-  | Some x -> Ok x
-
-// [core::slice::index::Range:::get]: forward function
-let core_slice_index_RangeUsize_get (t : Type0) (i : core_ops_range_Range usize) (s : slice t) :
-  result (option (slice t)) =
-  admit () // TODO
-
-// [core::slice::index::Range::get_mut]: forward function
-let core_slice_index_RangeUsize_get_mut (t : Type0) :
-  core_ops_range_Range usize → slice t → result (option (slice t) & (option (slice t) -> result (slice t))) =
-  admit () // TODO
-
-// [core::slice::index::Range::get_unchecked]: forward function
-let core_slice_index_RangeUsize_get_unchecked
-  (t : Type0) :
-  core_ops_range_Range usize → const_raw_ptr (slice t) → result (const_raw_ptr (slice t)) =
-  // Don't know what the model should be - for now we always fail to make
-  // sure code which uses it fails
-  fun _ _ -> Fail Failure
-
-// [core::slice::index::Range::get_unchecked_mut]: forward function
-let core_slice_index_RangeUsize_get_unchecked_mut
-  (t : Type0) :
-  core_ops_range_Range usize → mut_raw_ptr (slice t) → result (mut_raw_ptr (slice t)) =
-  // Don't know what the model should be - for now we always fail to make
-  // sure code which uses it fails
-  fun _ _ -> Fail Failure
-
-// [core::slice::index::Range::index]: forward function
-let core_slice_index_RangeUsize_index
-  (t : Type0) : core_ops_range_Range usize → slice t → result (slice t) =
-  admit () // TODO
-
-// [core::slice::index::Range::index_mut]: forward function
-let core_slice_index_RangeUsize_index_mut (t : Type0) :
-  core_ops_range_Range usize → slice t → result (slice t & (slice t -> result (slice t))) =
-  admit () // TODO
-
-// [core::slice::index::[T]::index_mut]: forward function
-let core_slice_index_Slice_index_mut
-  (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t)) :
-  slice t → idx → result (inst.output & (inst.output -> result (slice t))) =
-  admit () // 
-
-// [core::array::[T; N]::index]: forward function
-let core_array_Array_index
-  (t idx : Type0) (n : usize) (inst : core_ops_index_Index (slice t) idx)
-  (a : array t n) (i : idx) : result inst.output =
-  admit () // TODO
-
-// [core::array::[T; N]::index_mut]: forward function
-let core_array_Array_index_mut
-  (t idx : Type0) (n : usize) (inst : core_ops_index_IndexMut (slice t) idx)
-  (a : array t n) (i : idx) :
-  result (inst.indexInst.output & (inst.indexInst.output -> result (array t n))) =
-  admit () // TODO
-
-// Trait implementation: [core::slice::index::private_slice_index::Range]
-let core_slice_index_private_slice_index_SealedRangeUsizeInst
-  : core_slice_index_private_slice_index_Sealed (core_ops_range_Range usize) = ()
-
-// Trait implementation: [core::slice::index::Range]
-let core_slice_index_SliceIndexRangeUsizeSliceTInst (t : Type0) :
-  core_slice_index_SliceIndex (core_ops_range_Range usize) (slice t) = {
-  sealedInst = core_slice_index_private_slice_index_SealedRangeUsizeInst;
-  output = slice t;
-  get = core_slice_index_RangeUsize_get t;
-  get_mut = core_slice_index_RangeUsize_get_mut t;
-  get_unchecked = core_slice_index_RangeUsize_get_unchecked t;
-  get_unchecked_mut = core_slice_index_RangeUsize_get_unchecked_mut t;
-  index = core_slice_index_RangeUsize_index t;
-  index_mut = core_slice_index_RangeUsize_index_mut t;
-}
-
-// Trait implementation: [core::slice::index::[T]]
-let core_ops_index_IndexSliceTIInst (t idx : Type0)
-  (inst : core_slice_index_SliceIndex idx (slice t)) :
-  core_ops_index_Index (slice t) idx = {
-  output = inst.output;
-  index = core_slice_index_Slice_index t idx inst;
-}
-
-// Trait implementation: [core::slice::index::[T]]
-let core_ops_index_IndexMutSliceTIInst (t idx : Type0)
-  (inst : core_slice_index_SliceIndex idx (slice t)) :
-  core_ops_index_IndexMut (slice t) idx = {
-  indexInst = core_ops_index_IndexSliceTIInst t idx inst;
-  index_mut = core_slice_index_Slice_index_mut t idx inst;
-}
-
-// Trait implementation: [core::array::[T; N]]
-let core_ops_index_IndexArrayInst (t idx : Type0) (n : usize)
-  (inst : core_ops_index_Index (slice t) idx) :
-  core_ops_index_Index (array t n) idx = {
-  output = inst.output;
-  index = core_array_Array_index t idx n inst;
-}
-
-// Trait implementation: [core::array::[T; N]]
-let core_ops_index_IndexMutArrayIInst (t idx : Type0) (n : usize)
-  (inst : core_ops_index_IndexMut (slice t) idx) :
-  core_ops_index_IndexMut (array t n) idx = {
-  indexInst = core_ops_index_IndexArrayInst t idx n inst.indexInst;
-  index_mut = core_array_Array_index_mut t idx n inst;
-}
-
-// [core::slice::index::usize::get]: forward function
-let core_slice_index_usize_get
-  (t : Type0) : usize → slice t → result (option t) =
-  admit () // TODO
-
-// [core::slice::index::usize::get_mut]: forward function
-let core_slice_index_usize_get_mut (t : Type0) :
-  usize → slice t → result (option t & (option t -> result (slice t))) =
-  admit () // TODO
-
-// [core::slice::index::usize::get_unchecked]: forward function
-let core_slice_index_usize_get_unchecked
-  (t : Type0) : usize → const_raw_ptr (slice t) → result (const_raw_ptr t) =
-  admit () // TODO
-
-// [core::slice::index::usize::get_unchecked_mut]: forward function
-let core_slice_index_usize_get_unchecked_mut
-  (t : Type0) : usize → mut_raw_ptr (slice t) → result (mut_raw_ptr t) =
-  admit () // TODO
-
-// [core::slice::index::usize::index]: forward function
-let core_slice_index_usize_index (t : Type0) : usize → slice t → result t =
-  admit () // TODO
-
-// [core::slice::index::usize::index_mut]: forward function
-let core_slice_index_usize_index_mut (t : Type0) :
-  usize → slice t → result (t & (t -> result (slice t))) =
-  admit () // TODO
-
-// Trait implementation: [core::slice::index::private_slice_index::usize]
-let core_slice_index_private_slice_index_SealedUsizeInst
-  : core_slice_index_private_slice_index_Sealed usize = ()
-
-// Trait implementation: [core::slice::index::usize]
-let core_slice_index_SliceIndexUsizeSliceTInst (t : Type0) :
-  core_slice_index_SliceIndex usize (slice t) = {
-  sealedInst = core_slice_index_private_slice_index_SealedUsizeInst;
-  output = t;
-  get = core_slice_index_usize_get t;
-  get_mut = core_slice_index_usize_get_mut t;
-  get_unchecked = core_slice_index_usize_get_unchecked t;
-  get_unchecked_mut = core_slice_index_usize_get_unchecked_mut t;
-  index = core_slice_index_usize_index t;
-  index_mut = core_slice_index_usize_index_mut t;
-}
-
-// [alloc::vec::Vec::index]: forward function
-let alloc_vec_Vec_index (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t))
-  (self : alloc_vec_Vec t) (i : idx) : result inst.output =
-  admit () // TODO
-
-// [alloc::vec::Vec::index_mut]: forward function
-let alloc_vec_Vec_index_mut (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t))
-  (self : alloc_vec_Vec t) (i : idx) :
-  result (inst.output & (inst.output -> result (alloc_vec_Vec t))) =
-  admit () // TODO
-
-// Trait implementation: [alloc::vec::Vec]
-let alloc_vec_Vec_coreopsindexIndexInst (t idx : Type0)
-  (inst : core_slice_index_SliceIndex idx (slice t)) :
-  core_ops_index_Index (alloc_vec_Vec t) idx = {
-  output = inst.output;
-  index = alloc_vec_Vec_index t idx inst;
-}
-
-// Trait implementation: [alloc::vec::Vec]
-let alloc_vec_Vec_coreopsindexIndexMutInst (t idx : Type0)
-  (inst : core_slice_index_SliceIndex idx (slice t)) :
-  core_ops_index_IndexMut (alloc_vec_Vec t) idx = {
-  indexInst = alloc_vec_Vec_coreopsindexIndexInst t idx inst;
-  index_mut = alloc_vec_Vec_index_mut t idx inst;
-}
-
-(*** Theorems *)
-
-let alloc_vec_Vec_index_eq (#a : Type0) (v : alloc_vec_Vec a) (i : usize) :
-  Lemma (
-    alloc_vec_Vec_index a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i ==
-      alloc_vec_Vec_index_usize v i)
-  [SMTPat (alloc_vec_Vec_index a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i)]
-  =
-  admit()
-
-let alloc_vec_Vec_index_mut_eq (#a : Type0) (v : alloc_vec_Vec a) (i : usize) :
-  Lemma (
-    alloc_vec_Vec_index_mut a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i ==
-      alloc_vec_Vec_index_mut_usize v i)
-  [SMTPat (alloc_vec_Vec_index_mut a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i)]
-  =
-  admit()
diff --git a/tests/fstar/misc/Bitwise.fst b/tests/fstar/misc/Bitwise.fst
index b17c9233..7945e142 100644
--- a/tests/fstar/misc/Bitwise.fst
+++ b/tests/fstar/misc/Bitwise.fst
@@ -6,27 +6,27 @@ open Primitives
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [bitwise::shift_u32]:
-    Source: 'tests/src/bitwise.rs', lines 3:0-3:31 *)
+    Source: 'tests/src/bitwise.rs', lines 5:0-5:31 *)
 let shift_u32 (a : u32) : result u32 =
   let* t = u32_shr #Usize a 16 in u32_shl #Usize t 16
 
 (** [bitwise::shift_i32]:
-    Source: 'tests/src/bitwise.rs', lines 10:0-10:31 *)
+    Source: 'tests/src/bitwise.rs', lines 12:0-12:31 *)
 let shift_i32 (a : i32) : result i32 =
   let* t = i32_shr #Isize a 16 in i32_shl #Isize t 16
 
 (** [bitwise::xor_u32]:
-    Source: 'tests/src/bitwise.rs', lines 17:0-17:37 *)
+    Source: 'tests/src/bitwise.rs', lines 19:0-19:37 *)
 let xor_u32 (a : u32) (b : u32) : result u32 =
   Ok (u32_xor a b)
 
 (** [bitwise::or_u32]:
-    Source: 'tests/src/bitwise.rs', lines 21:0-21:36 *)
+    Source: 'tests/src/bitwise.rs', lines 23:0-23:36 *)
 let or_u32 (a : u32) (b : u32) : result u32 =
   Ok (u32_or a b)
 
 (** [bitwise::and_u32]:
-    Source: 'tests/src/bitwise.rs', lines 25:0-25:37 *)
+    Source: 'tests/src/bitwise.rs', lines 27:0-27:37 *)
 let and_u32 (a : u32) (b : u32) : result u32 =
   Ok (u32_and a b)
 
diff --git a/tests/fstar/misc/Constants.fst b/tests/fstar/misc/Constants.fst
index 78562ae1..1d72f5ff 100644
--- a/tests/fstar/misc/Constants.fst
+++ b/tests/fstar/misc/Constants.fst
@@ -6,154 +6,154 @@ open Primitives
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [constants::X0]
-    Source: 'tests/src/constants.rs', lines 5:0-5:17 *)
+    Source: 'tests/src/constants.rs', lines 8:0-8:17 *)
 let x0_body : result u32 = Ok 0
 let x0 : u32 = eval_global x0_body
 
 (** [constants::X1]
-    Source: 'tests/src/constants.rs', lines 7:0-7:17 *)
+    Source: 'tests/src/constants.rs', lines 10:0-10:17 *)
 let x1_body : result u32 = Ok core_u32_max
 let x1 : u32 = eval_global x1_body
 
 (** [constants::X2]
-    Source: 'tests/src/constants.rs', lines 10:0-10:17 *)
+    Source: 'tests/src/constants.rs', lines 13:0-13:17 *)
 let x2_body : result u32 = Ok 3
 let x2 : u32 = eval_global x2_body
 
 (** [constants::incr]:
-    Source: 'tests/src/constants.rs', lines 17:0-17:32 *)
+    Source: 'tests/src/constants.rs', lines 20:0-20:32 *)
 let incr (n : u32) : result u32 =
   u32_add n 1
 
 (** [constants::X3]
-    Source: 'tests/src/constants.rs', lines 15:0-15:17 *)
+    Source: 'tests/src/constants.rs', lines 18:0-18:17 *)
 let x3_body : result u32 = incr 32
 let x3 : u32 = eval_global x3_body
 
 (** [constants::mk_pair0]:
-    Source: 'tests/src/constants.rs', lines 23:0-23:51 *)
+    Source: 'tests/src/constants.rs', lines 26:0-26:51 *)
 let mk_pair0 (x : u32) (y1 : u32) : result (u32 & u32) =
   Ok (x, y1)
 
 (** [constants::Pair]
-    Source: 'tests/src/constants.rs', lines 36:0-36:23 *)
+    Source: 'tests/src/constants.rs', lines 39:0-39:23 *)
 type pair_t (t1 t2 : Type0) = { x : t1; y : t2; }
 
 (** [constants::mk_pair1]:
-    Source: 'tests/src/constants.rs', lines 27:0-27:55 *)
+    Source: 'tests/src/constants.rs', lines 30:0-30:55 *)
 let mk_pair1 (x : u32) (y1 : u32) : result (pair_t u32 u32) =
   Ok { x = x; y = y1 }
 
 (** [constants::P0]
-    Source: 'tests/src/constants.rs', lines 31:0-31:24 *)
+    Source: 'tests/src/constants.rs', lines 34:0-34:24 *)
 let p0_body : result (u32 & u32) = mk_pair0 0 1
 let p0 : (u32 & u32) = eval_global p0_body
 
 (** [constants::P1]
-    Source: 'tests/src/constants.rs', lines 32:0-32:28 *)
+    Source: 'tests/src/constants.rs', lines 35:0-35:28 *)
 let p1_body : result (pair_t u32 u32) = mk_pair1 0 1
 let p1 : pair_t u32 u32 = eval_global p1_body
 
 (** [constants::P2]
-    Source: 'tests/src/constants.rs', lines 33:0-33:24 *)
+    Source: 'tests/src/constants.rs', lines 36:0-36:24 *)
 let p2_body : result (u32 & u32) = Ok (0, 1)
 let p2 : (u32 & u32) = eval_global p2_body
 
 (** [constants::P3]
-    Source: 'tests/src/constants.rs', lines 34:0-34:28 *)
+    Source: 'tests/src/constants.rs', lines 37:0-37:28 *)
 let p3_body : result (pair_t u32 u32) = Ok { x = 0; y = 1 }
 let p3 : pair_t u32 u32 = eval_global p3_body
 
 (** [constants::Wrap]
-    Source: 'tests/src/constants.rs', lines 49:0-49:18 *)
+    Source: 'tests/src/constants.rs', lines 52:0-52:18 *)
 type wrap_t (t : Type0) = { value : t; }
 
 (** [constants::{constants::Wrap<T>}::new]:
-    Source: 'tests/src/constants.rs', lines 54:4-54:41 *)
+    Source: 'tests/src/constants.rs', lines 57:4-57:41 *)
 let wrap_new (t : Type0) (value : t) : result (wrap_t t) =
   Ok { value = value }
 
 (** [constants::Y]
-    Source: 'tests/src/constants.rs', lines 41:0-41:22 *)
+    Source: 'tests/src/constants.rs', lines 44:0-44:22 *)
 let y_body : result (wrap_t i32) = wrap_new i32 2
 let y : wrap_t i32 = eval_global y_body
 
 (** [constants::unwrap_y]:
-    Source: 'tests/src/constants.rs', lines 43:0-43:30 *)
+    Source: 'tests/src/constants.rs', lines 46:0-46:30 *)
 let unwrap_y : result i32 =
   Ok y.value
 
 (** [constants::YVAL]
-    Source: 'tests/src/constants.rs', lines 47:0-47:19 *)
+    Source: 'tests/src/constants.rs', lines 50:0-50:19 *)
 let yval_body : result i32 = unwrap_y
 let yval : i32 = eval_global yval_body
 
 (** [constants::get_z1::Z1]
-    Source: 'tests/src/constants.rs', lines 62:4-62:17 *)
+    Source: 'tests/src/constants.rs', lines 65:4-65:17 *)
 let get_z1_z1_body : result i32 = Ok 3
 let get_z1_z1 : i32 = eval_global get_z1_z1_body
 
 (** [constants::get_z1]:
-    Source: 'tests/src/constants.rs', lines 61:0-61:28 *)
+    Source: 'tests/src/constants.rs', lines 64:0-64:28 *)
 let get_z1 : result i32 =
   Ok get_z1_z1
 
 (** [constants::add]:
-    Source: 'tests/src/constants.rs', lines 66:0-66:39 *)
+    Source: 'tests/src/constants.rs', lines 69:0-69:39 *)
 let add (a : i32) (b : i32) : result i32 =
   i32_add a b
 
 (** [constants::Q1]
-    Source: 'tests/src/constants.rs', lines 74:0-74:17 *)
+    Source: 'tests/src/constants.rs', lines 77:0-77:17 *)
 let q1_body : result i32 = Ok 5
 let q1 : i32 = eval_global q1_body
 
 (** [constants::Q2]
-    Source: 'tests/src/constants.rs', lines 75:0-75:17 *)
+    Source: 'tests/src/constants.rs', lines 78:0-78:17 *)
 let q2_body : result i32 = Ok q1
 let q2 : i32 = eval_global q2_body
 
 (** [constants::Q3]
-    Source: 'tests/src/constants.rs', lines 76:0-76:17 *)
+    Source: 'tests/src/constants.rs', lines 79:0-79:17 *)
 let q3_body : result i32 = add q2 3
 let q3 : i32 = eval_global q3_body
 
 (** [constants::get_z2]:
-    Source: 'tests/src/constants.rs', lines 70:0-70:28 *)
+    Source: 'tests/src/constants.rs', lines 73:0-73:28 *)
 let get_z2 : result i32 =
   let* i = get_z1 in let* i1 = add i q3 in add q1 i1
 
 (** [constants::S1]
-    Source: 'tests/src/constants.rs', lines 80:0-80:18 *)
+    Source: 'tests/src/constants.rs', lines 83:0-83:18 *)
 let s1_body : result u32 = Ok 6
 let s1 : u32 = eval_global s1_body
 
 (** [constants::S2]
-    Source: 'tests/src/constants.rs', lines 81:0-81:18 *)
+    Source: 'tests/src/constants.rs', lines 84:0-84:18 *)
 let s2_body : result u32 = incr s1
 let s2 : u32 = eval_global s2_body
 
 (** [constants::S3]
-    Source: 'tests/src/constants.rs', lines 82:0-82:29 *)
+    Source: 'tests/src/constants.rs', lines 85:0-85:29 *)
 let s3_body : result (pair_t u32 u32) = Ok p3
 let s3 : pair_t u32 u32 = eval_global s3_body
 
 (** [constants::S4]
-    Source: 'tests/src/constants.rs', lines 83:0-83:29 *)
+    Source: 'tests/src/constants.rs', lines 86:0-86:29 *)
 let s4_body : result (pair_t u32 u32) = mk_pair1 7 8
 let s4 : pair_t u32 u32 = eval_global s4_body
 
 (** [constants::V]
-    Source: 'tests/src/constants.rs', lines 86:0-86:31 *)
+    Source: 'tests/src/constants.rs', lines 89:0-89:31 *)
 type v_t (t : Type0) (n : usize) = { x : array t n; }
 
 (** [constants::{constants::V<T, N>#1}::LEN]
-    Source: 'tests/src/constants.rs', lines 91:4-91:24 *)
+    Source: 'tests/src/constants.rs', lines 94:4-94:24 *)
 let v_len_body (t : Type0) (n : usize) : result usize = Ok n
 let v_len (t : Type0) (n : usize) : usize = eval_global (v_len_body t n)
 
 (** [constants::use_v]:
-    Source: 'tests/src/constants.rs', lines 94:0-94:42 *)
+    Source: 'tests/src/constants.rs', lines 97:0-97:42 *)
 let use_v (t : Type0) (n : usize) : result usize =
   Ok (v_len t n)
 
diff --git a/tests/fstar/misc/External.Funs.fst b/tests/fstar/misc/External.Funs.fst
index 5a7a9f32..f5e8d4b7 100644
--- a/tests/fstar/misc/External.Funs.fst
+++ b/tests/fstar/misc/External.Funs.fst
@@ -15,12 +15,12 @@ let core_marker_CopyU32 : core_marker_Copy_t u32 = {
 }
 
 (** [external::use_get]:
-    Source: 'tests/src/external.rs', lines 5:0-5:37 *)
+    Source: 'tests/src/external.rs', lines 9:0-9:37 *)
 let use_get (rc : core_cell_Cell_t u32) (st : state) : result (state & u32) =
   core_cell_Cell_get u32 core_marker_CopyU32 rc st
 
 (** [external::incr]:
-    Source: 'tests/src/external.rs', lines 9:0-9:31 *)
+    Source: 'tests/src/external.rs', lines 13:0-13:31 *)
 let incr
   (rc : core_cell_Cell_t u32) (st : state) :
   result (state & (core_cell_Cell_t u32))
diff --git a/tests/fstar/misc/InfiniteLoop.fst b/tests/fstar/misc/InfiniteLoop.fst
new file mode 100644
index 00000000..4e7c8c06
--- /dev/null
+++ b/tests/fstar/misc/InfiniteLoop.fst
@@ -0,0 +1,24 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
+(** [infinite_loop] *)
+module InfiniteLoop
+open Primitives
+
+#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
+
+(** [infinite_loop::bar]:
+    Source: 'tests/src/infinite-loop.rs', lines 4:0-4:8 *)
+let bar : result unit =
+  Ok ()
+
+(** [infinite_loop::foo]: loop 0:
+    Source: 'tests/src/infinite-loop.rs', lines 6:0-10:1 *)
+let rec foo_loop (n : nat) : result unit =
+  if is_zero n
+  then Fail OutOfFuel
+  else let n1 = decrease n in let* _ = bar in foo_loop n1
+
+(** [infinite_loop::foo]:
+    Source: 'tests/src/infinite-loop.rs', lines 6:0-6:8 *)
+let foo (n : nat) : result unit =
+  foo_loop n
+
diff --git a/tests/fstar/misc/Issue194RecursiveStructProjector.fst b/tests/fstar/misc/Issue194RecursiveStructProjector.fst
new file mode 100644
index 00000000..76368f04
--- /dev/null
+++ b/tests/fstar/misc/Issue194RecursiveStructProjector.fst
@@ -0,0 +1,24 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
+(** [issue_194_recursive_struct_projector] *)
+module Issue194RecursiveStructProjector
+open Primitives
+
+#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
+
+(** [issue_194_recursive_struct_projector::AVLNode]
+    Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 2:0-2:17 *)
+type aVLNode_t (t : Type0) =
+{
+  value : t; left : option (aVLNode_t t); right : option (aVLNode_t t);
+}
+
+(** [issue_194_recursive_struct_projector::get_val]:
+    Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 10:0-10:33 *)
+let get_val (t : Type0) (x : aVLNode_t t) : result t =
+  Ok x.value
+
+(** [issue_194_recursive_struct_projector::get_left]:
+    Source: 'tests/src/issue-194-recursive-struct-projector.rs', lines 14:0-14:43 *)
+let get_left (t : Type0) (x : aVLNode_t t) : result (option (aVLNode_t t)) =
+  Ok x.left
+
diff --git a/tests/fstar/misc/Loops.Clauses.Template.fst b/tests/fstar/misc/Loops.Clauses.Template.fst
index 77f9c3e4..5d450275 100644
--- a/tests/fstar/misc/Loops.Clauses.Template.fst
+++ b/tests/fstar/misc/Loops.Clauses.Template.fst
@@ -7,144 +7,144 @@ open Loops.Types
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [loops::sum]: decreases clause
-    Source: 'tests/src/loops.rs', lines 4:0-14:1 *)
+    Source: 'tests/src/loops.rs', lines 8:0-18:1 *)
 unfold let sum_loop_decreases (max : u32) (i : u32) (s : u32) : nat = admit ()
 
 (** [loops::sum_with_mut_borrows]: decreases clause
-    Source: 'tests/src/loops.rs', lines 19:0-31:1 *)
+    Source: 'tests/src/loops.rs', lines 23:0-35:1 *)
 unfold
 let sum_with_mut_borrows_loop_decreases (max : u32) (i : u32) (s : u32) : nat =
   admit ()
 
 (** [loops::sum_with_shared_borrows]: decreases clause
-    Source: 'tests/src/loops.rs', lines 34:0-48:1 *)
+    Source: 'tests/src/loops.rs', lines 38:0-52:1 *)
 unfold
 let sum_with_shared_borrows_loop_decreases (max : u32) (i : u32) (s : u32) :
   nat =
   admit ()
 
 (** [loops::sum_array]: decreases clause
-    Source: 'tests/src/loops.rs', lines 50:0-58:1 *)
+    Source: 'tests/src/loops.rs', lines 54:0-62:1 *)
 unfold
 let sum_array_loop_decreases (n : usize) (a : array u32 n) (i : usize)
   (s : u32) : nat =
   admit ()
 
 (** [loops::clear]: decreases clause
-    Source: 'tests/src/loops.rs', lines 62:0-68:1 *)
+    Source: 'tests/src/loops.rs', lines 66:0-72:1 *)
 unfold
 let clear_loop_decreases (v : alloc_vec_Vec u32) (i : usize) : nat = admit ()
 
 (** [loops::list_mem]: decreases clause
-    Source: 'tests/src/loops.rs', lines 76:0-85:1 *)
+    Source: 'tests/src/loops.rs', lines 80:0-89:1 *)
 unfold let list_mem_loop_decreases (x : u32) (ls : list_t u32) : nat = admit ()
 
 (** [loops::list_nth_mut_loop]: decreases clause
-    Source: 'tests/src/loops.rs', lines 88:0-98:1 *)
+    Source: 'tests/src/loops.rs', lines 92:0-102:1 *)
 unfold
 let list_nth_mut_loop_loop_decreases (t : Type0) (ls : list_t t) (i : u32) :
   nat =
   admit ()
 
 (** [loops::list_nth_shared_loop]: decreases clause
-    Source: 'tests/src/loops.rs', lines 101:0-111:1 *)
+    Source: 'tests/src/loops.rs', lines 105:0-115:1 *)
 unfold
 let list_nth_shared_loop_loop_decreases (t : Type0) (ls : list_t t) (i : u32) :
   nat =
   admit ()
 
 (** [loops::get_elem_mut]: decreases clause
-    Source: 'tests/src/loops.rs', lines 113:0-127:1 *)
+    Source: 'tests/src/loops.rs', lines 117:0-131:1 *)
 unfold
 let get_elem_mut_loop_decreases (x : usize) (ls : list_t usize) : nat =
   admit ()
 
 (** [loops::get_elem_shared]: decreases clause
-    Source: 'tests/src/loops.rs', lines 129:0-143:1 *)
+    Source: 'tests/src/loops.rs', lines 133:0-147:1 *)
 unfold
 let get_elem_shared_loop_decreases (x : usize) (ls : list_t usize) : nat =
   admit ()
 
 (** [loops::list_nth_mut_loop_with_id]: decreases clause
-    Source: 'tests/src/loops.rs', lines 154:0-165:1 *)
+    Source: 'tests/src/loops.rs', lines 158:0-169:1 *)
 unfold
 let list_nth_mut_loop_with_id_loop_decreases (t : Type0) (i : u32)
   (ls : list_t t) : nat =
   admit ()
 
 (** [loops::list_nth_shared_loop_with_id]: decreases clause
-    Source: 'tests/src/loops.rs', lines 168:0-179:1 *)
+    Source: 'tests/src/loops.rs', lines 172:0-183:1 *)
 unfold
 let list_nth_shared_loop_with_id_loop_decreases (t : Type0) (i : u32)
   (ls : list_t t) : nat =
   admit ()
 
 (** [loops::list_nth_mut_loop_pair]: decreases clause
-    Source: 'tests/src/loops.rs', lines 184:0-205:1 *)
+    Source: 'tests/src/loops.rs', lines 188:0-209:1 *)
 unfold
 let list_nth_mut_loop_pair_loop_decreases (t : Type0) (ls0 : list_t t)
   (ls1 : list_t t) (i : u32) : nat =
   admit ()
 
 (** [loops::list_nth_shared_loop_pair]: decreases clause
-    Source: 'tests/src/loops.rs', lines 208:0-229:1 *)
+    Source: 'tests/src/loops.rs', lines 212:0-233:1 *)
 unfold
 let list_nth_shared_loop_pair_loop_decreases (t : Type0) (ls0 : list_t t)
   (ls1 : list_t t) (i : u32) : nat =
   admit ()
 
 (** [loops::list_nth_mut_loop_pair_merge]: decreases clause
-    Source: 'tests/src/loops.rs', lines 233:0-248:1 *)
+    Source: 'tests/src/loops.rs', lines 237:0-252:1 *)
 unfold
 let list_nth_mut_loop_pair_merge_loop_decreases (t : Type0) (ls0 : list_t t)
   (ls1 : list_t t) (i : u32) : nat =
   admit ()
 
 (** [loops::list_nth_shared_loop_pair_merge]: decreases clause
-    Source: 'tests/src/loops.rs', lines 251:0-266:1 *)
+    Source: 'tests/src/loops.rs', lines 255:0-270:1 *)
 unfold
 let list_nth_shared_loop_pair_merge_loop_decreases (t : Type0) (ls0 : list_t t)
   (ls1 : list_t t) (i : u32) : nat =
   admit ()
 
 (** [loops::list_nth_mut_shared_loop_pair]: decreases clause
-    Source: 'tests/src/loops.rs', lines 269:0-284:1 *)
+    Source: 'tests/src/loops.rs', lines 273:0-288:1 *)
 unfold
 let list_nth_mut_shared_loop_pair_loop_decreases (t : Type0) (ls0 : list_t t)
   (ls1 : list_t t) (i : u32) : nat =
   admit ()
 
 (** [loops::list_nth_mut_shared_loop_pair_merge]: decreases clause
-    Source: 'tests/src/loops.rs', lines 288:0-303:1 *)
+    Source: 'tests/src/loops.rs', lines 292:0-307:1 *)
 unfold
 let list_nth_mut_shared_loop_pair_merge_loop_decreases (t : Type0)
   (ls0 : list_t t) (ls1 : list_t t) (i : u32) : nat =
   admit ()
 
 (** [loops::list_nth_shared_mut_loop_pair]: decreases clause
-    Source: 'tests/src/loops.rs', lines 307:0-322:1 *)
+    Source: 'tests/src/loops.rs', lines 311:0-326:1 *)
 unfold
 let list_nth_shared_mut_loop_pair_loop_decreases (t : Type0) (ls0 : list_t t)
   (ls1 : list_t t) (i : u32) : nat =
   admit ()
 
 (** [loops::list_nth_shared_mut_loop_pair_merge]: decreases clause
-    Source: 'tests/src/loops.rs', lines 326:0-341:1 *)
+    Source: 'tests/src/loops.rs', lines 330:0-345:1 *)
 unfold
 let list_nth_shared_mut_loop_pair_merge_loop_decreases (t : Type0)
   (ls0 : list_t t) (ls1 : list_t t) (i : u32) : nat =
   admit ()
 
 (** [loops::ignore_input_mut_borrow]: decreases clause
-    Source: 'tests/src/loops.rs', lines 345:0-349:1 *)
+    Source: 'tests/src/loops.rs', lines 349:0-353:1 *)
 unfold let ignore_input_mut_borrow_loop_decreases (i : u32) : nat = admit ()
 
 (** [loops::incr_ignore_input_mut_borrow]: decreases clause
-    Source: 'tests/src/loops.rs', lines 353:0-358:1 *)
+    Source: 'tests/src/loops.rs', lines 357:0-362:1 *)
 unfold
 let incr_ignore_input_mut_borrow_loop_decreases (i : u32) : nat = admit ()
 
 (** [loops::ignore_input_shared_borrow]: decreases clause
-    Source: 'tests/src/loops.rs', lines 362:0-366:1 *)
+    Source: 'tests/src/loops.rs', lines 366:0-370:1 *)
 unfold let ignore_input_shared_borrow_loop_decreases (i : u32) : nat = admit ()
 
diff --git a/tests/fstar/misc/Loops.Funs.fst b/tests/fstar/misc/Loops.Funs.fst
index 0eafeebb..05e77046 100644
--- a/tests/fstar/misc/Loops.Funs.fst
+++ b/tests/fstar/misc/Loops.Funs.fst
@@ -8,7 +8,7 @@ include Loops.Clauses
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [loops::sum]: loop 0:
-    Source: 'tests/src/loops.rs', lines 4:0-14:1 *)
+    Source: 'tests/src/loops.rs', lines 8:0-18:1 *)
 let rec sum_loop
   (max : u32) (i : u32) (s : u32) :
   Tot (result u32) (decreases (sum_loop_decreases max i s))
@@ -18,12 +18,12 @@ let rec sum_loop
   else u32_mul s 2
 
 (** [loops::sum]:
-    Source: 'tests/src/loops.rs', lines 4:0-4:27 *)
+    Source: 'tests/src/loops.rs', lines 8:0-8:27 *)
 let sum (max : u32) : result u32 =
   sum_loop max 0 0
 
 (** [loops::sum_with_mut_borrows]: loop 0:
-    Source: 'tests/src/loops.rs', lines 19:0-31:1 *)
+    Source: 'tests/src/loops.rs', lines 23:0-35:1 *)
 let rec sum_with_mut_borrows_loop
   (max : u32) (i : u32) (s : u32) :
   Tot (result u32) (decreases (sum_with_mut_borrows_loop_decreases max i s))
@@ -36,12 +36,12 @@ let rec sum_with_mut_borrows_loop
   else u32_mul s 2
 
 (** [loops::sum_with_mut_borrows]:
-    Source: 'tests/src/loops.rs', lines 19:0-19:44 *)
+    Source: 'tests/src/loops.rs', lines 23:0-23:44 *)
 let sum_with_mut_borrows (max : u32) : result u32 =
   sum_with_mut_borrows_loop max 0 0
 
 (** [loops::sum_with_shared_borrows]: loop 0:
-    Source: 'tests/src/loops.rs', lines 34:0-48:1 *)
+    Source: 'tests/src/loops.rs', lines 38:0-52:1 *)
 let rec sum_with_shared_borrows_loop
   (max : u32) (i : u32) (s : u32) :
   Tot (result u32) (decreases (sum_with_shared_borrows_loop_decreases max i s))
@@ -54,12 +54,12 @@ let rec sum_with_shared_borrows_loop
   else u32_mul s 2
 
 (** [loops::sum_with_shared_borrows]:
-    Source: 'tests/src/loops.rs', lines 34:0-34:47 *)
+    Source: 'tests/src/loops.rs', lines 38:0-38:47 *)
 let sum_with_shared_borrows (max : u32) : result u32 =
   sum_with_shared_borrows_loop max 0 0
 
 (** [loops::sum_array]: loop 0:
-    Source: 'tests/src/loops.rs', lines 50:0-58:1 *)
+    Source: 'tests/src/loops.rs', lines 54:0-62:1 *)
 let rec sum_array_loop
   (n : usize) (a : array u32 n) (i : usize) (s : u32) :
   Tot (result u32) (decreases (sum_array_loop_decreases n a i s))
@@ -73,12 +73,12 @@ let rec sum_array_loop
   else Ok s
 
 (** [loops::sum_array]:
-    Source: 'tests/src/loops.rs', lines 50:0-50:52 *)
+    Source: 'tests/src/loops.rs', lines 54:0-54:52 *)
 let sum_array (n : usize) (a : array u32 n) : result u32 =
   sum_array_loop n a 0 0
 
 (** [loops::clear]: loop 0:
-    Source: 'tests/src/loops.rs', lines 62:0-68:1 *)
+    Source: 'tests/src/loops.rs', lines 66:0-72:1 *)
 let rec clear_loop
   (v : alloc_vec_Vec u32) (i : usize) :
   Tot (result (alloc_vec_Vec u32)) (decreases (clear_loop_decreases v i))
@@ -95,12 +95,12 @@ let rec clear_loop
   else Ok v
 
 (** [loops::clear]:
-    Source: 'tests/src/loops.rs', lines 62:0-62:30 *)
+    Source: 'tests/src/loops.rs', lines 66:0-66:30 *)
 let clear (v : alloc_vec_Vec u32) : result (alloc_vec_Vec u32) =
   clear_loop v 0
 
 (** [loops::list_mem]: loop 0:
-    Source: 'tests/src/loops.rs', lines 76:0-85:1 *)
+    Source: 'tests/src/loops.rs', lines 80:0-89:1 *)
 let rec list_mem_loop
   (x : u32) (ls : list_t u32) :
   Tot (result bool) (decreases (list_mem_loop_decreases x ls))
@@ -111,12 +111,12 @@ let rec list_mem_loop
   end
 
 (** [loops::list_mem]:
-    Source: 'tests/src/loops.rs', lines 76:0-76:52 *)
+    Source: 'tests/src/loops.rs', lines 80:0-80:52 *)
 let list_mem (x : u32) (ls : list_t u32) : result bool =
   list_mem_loop x ls
 
 (** [loops::list_nth_mut_loop]: loop 0:
-    Source: 'tests/src/loops.rs', lines 88:0-98:1 *)
+    Source: 'tests/src/loops.rs', lines 92:0-102:1 *)
 let rec list_nth_mut_loop_loop
   (t : Type0) (ls : list_t t) (i : u32) :
   Tot (result (t & (t -> result (list_t t))))
@@ -135,7 +135,7 @@ let rec list_nth_mut_loop_loop
   end
 
 (** [loops::list_nth_mut_loop]:
-    Source: 'tests/src/loops.rs', lines 88:0-88:71 *)
+    Source: 'tests/src/loops.rs', lines 92:0-92:71 *)
 let list_nth_mut_loop
   (t : Type0) (ls : list_t t) (i : u32) :
   result (t & (t -> result (list_t t)))
@@ -143,7 +143,7 @@ let list_nth_mut_loop
   list_nth_mut_loop_loop t ls i
 
 (** [loops::list_nth_shared_loop]: loop 0:
-    Source: 'tests/src/loops.rs', lines 101:0-111:1 *)
+    Source: 'tests/src/loops.rs', lines 105:0-115:1 *)
 let rec list_nth_shared_loop_loop
   (t : Type0) (ls : list_t t) (i : u32) :
   Tot (result t) (decreases (list_nth_shared_loop_loop_decreases t ls i))
@@ -157,12 +157,12 @@ let rec list_nth_shared_loop_loop
   end
 
 (** [loops::list_nth_shared_loop]:
-    Source: 'tests/src/loops.rs', lines 101:0-101:66 *)
+    Source: 'tests/src/loops.rs', lines 105:0-105:66 *)
 let list_nth_shared_loop (t : Type0) (ls : list_t t) (i : u32) : result t =
   list_nth_shared_loop_loop t ls i
 
 (** [loops::get_elem_mut]: loop 0:
-    Source: 'tests/src/loops.rs', lines 113:0-127:1 *)
+    Source: 'tests/src/loops.rs', lines 117:0-131:1 *)
 let rec get_elem_mut_loop
   (x : usize) (ls : list_t usize) :
   Tot (result (usize & (usize -> result (list_t usize))))
@@ -180,7 +180,7 @@ let rec get_elem_mut_loop
   end
 
 (** [loops::get_elem_mut]:
-    Source: 'tests/src/loops.rs', lines 113:0-113:73 *)
+    Source: 'tests/src/loops.rs', lines 117:0-117:73 *)
 let get_elem_mut
   (slots : alloc_vec_Vec (list_t usize)) (x : usize) :
   result (usize & (usize -> result (alloc_vec_Vec (list_t usize))))
@@ -193,7 +193,7 @@ let get_elem_mut
   Ok (i, back1)
 
 (** [loops::get_elem_shared]: loop 0:
-    Source: 'tests/src/loops.rs', lines 129:0-143:1 *)
+    Source: 'tests/src/loops.rs', lines 133:0-147:1 *)
 let rec get_elem_shared_loop
   (x : usize) (ls : list_t usize) :
   Tot (result usize) (decreases (get_elem_shared_loop_decreases x ls))
@@ -204,7 +204,7 @@ let rec get_elem_shared_loop
   end
 
 (** [loops::get_elem_shared]:
-    Source: 'tests/src/loops.rs', lines 129:0-129:68 *)
+    Source: 'tests/src/loops.rs', lines 133:0-133:68 *)
 let get_elem_shared
   (slots : alloc_vec_Vec (list_t usize)) (x : usize) : result usize =
   let* ls =
@@ -213,7 +213,7 @@ let get_elem_shared
   get_elem_shared_loop x ls
 
 (** [loops::id_mut]:
-    Source: 'tests/src/loops.rs', lines 145:0-145:50 *)
+    Source: 'tests/src/loops.rs', lines 149:0-149:50 *)
 let id_mut
   (t : Type0) (ls : list_t t) :
   result ((list_t t) & (list_t t -> result (list_t t)))
@@ -221,12 +221,12 @@ let id_mut
   Ok (ls, Ok)
 
 (** [loops::id_shared]:
-    Source: 'tests/src/loops.rs', lines 149:0-149:45 *)
+    Source: 'tests/src/loops.rs', lines 153:0-153:45 *)
 let id_shared (t : Type0) (ls : list_t t) : result (list_t t) =
   Ok ls
 
 (** [loops::list_nth_mut_loop_with_id]: loop 0:
-    Source: 'tests/src/loops.rs', lines 154:0-165:1 *)
+    Source: 'tests/src/loops.rs', lines 158:0-169:1 *)
 let rec list_nth_mut_loop_with_id_loop
   (t : Type0) (i : u32) (ls : list_t t) :
   Tot (result (t & (t -> result (list_t t))))
@@ -245,7 +245,7 @@ let rec list_nth_mut_loop_with_id_loop
   end
 
 (** [loops::list_nth_mut_loop_with_id]:
-    Source: 'tests/src/loops.rs', lines 154:0-154:75 *)
+    Source: 'tests/src/loops.rs', lines 158:0-158:75 *)
 let list_nth_mut_loop_with_id
   (t : Type0) (ls : list_t t) (i : u32) :
   result (t & (t -> result (list_t t)))
@@ -256,7 +256,7 @@ let list_nth_mut_loop_with_id
   Ok (x, back1)
 
 (** [loops::list_nth_shared_loop_with_id]: loop 0:
-    Source: 'tests/src/loops.rs', lines 168:0-179:1 *)
+    Source: 'tests/src/loops.rs', lines 172:0-183:1 *)
 let rec list_nth_shared_loop_with_id_loop
   (t : Type0) (i : u32) (ls : list_t t) :
   Tot (result t)
@@ -271,13 +271,13 @@ let rec list_nth_shared_loop_with_id_loop
   end
 
 (** [loops::list_nth_shared_loop_with_id]:
-    Source: 'tests/src/loops.rs', lines 168:0-168:70 *)
+    Source: 'tests/src/loops.rs', lines 172:0-172:70 *)
 let list_nth_shared_loop_with_id
   (t : Type0) (ls : list_t t) (i : u32) : result t =
   let* ls1 = id_shared t ls in list_nth_shared_loop_with_id_loop t i ls1
 
 (** [loops::list_nth_mut_loop_pair]: loop 0:
-    Source: 'tests/src/loops.rs', lines 184:0-205:1 *)
+    Source: 'tests/src/loops.rs', lines 188:0-209:1 *)
 let rec list_nth_mut_loop_pair_loop
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   Tot (result ((t & t) & (t -> result (list_t t)) & (t -> result (list_t t))))
@@ -306,7 +306,7 @@ let rec list_nth_mut_loop_pair_loop
   end
 
 (** [loops::list_nth_mut_loop_pair]:
-    Source: 'tests/src/loops.rs', lines 184:0-188:27 *)
+    Source: 'tests/src/loops.rs', lines 188:0-192:27 *)
 let list_nth_mut_loop_pair
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   result ((t & t) & (t -> result (list_t t)) & (t -> result (list_t t)))
@@ -314,7 +314,7 @@ let list_nth_mut_loop_pair
   list_nth_mut_loop_pair_loop t ls0 ls1 i
 
 (** [loops::list_nth_shared_loop_pair]: loop 0:
-    Source: 'tests/src/loops.rs', lines 208:0-229:1 *)
+    Source: 'tests/src/loops.rs', lines 212:0-233:1 *)
 let rec list_nth_shared_loop_pair_loop
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   Tot (result (t & t))
@@ -333,13 +333,13 @@ let rec list_nth_shared_loop_pair_loop
   end
 
 (** [loops::list_nth_shared_loop_pair]:
-    Source: 'tests/src/loops.rs', lines 208:0-212:19 *)
+    Source: 'tests/src/loops.rs', lines 212:0-216:19 *)
 let list_nth_shared_loop_pair
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) : result (t & t) =
   list_nth_shared_loop_pair_loop t ls0 ls1 i
 
 (** [loops::list_nth_mut_loop_pair_merge]: loop 0:
-    Source: 'tests/src/loops.rs', lines 233:0-248:1 *)
+    Source: 'tests/src/loops.rs', lines 237:0-252:1 *)
 let rec list_nth_mut_loop_pair_merge_loop
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   Tot (result ((t & t) & ((t & t) -> result ((list_t t) & (list_t t)))))
@@ -369,7 +369,7 @@ let rec list_nth_mut_loop_pair_merge_loop
   end
 
 (** [loops::list_nth_mut_loop_pair_merge]:
-    Source: 'tests/src/loops.rs', lines 233:0-237:27 *)
+    Source: 'tests/src/loops.rs', lines 237:0-241:27 *)
 let list_nth_mut_loop_pair_merge
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   result ((t & t) & ((t & t) -> result ((list_t t) & (list_t t))))
@@ -377,7 +377,7 @@ let list_nth_mut_loop_pair_merge
   list_nth_mut_loop_pair_merge_loop t ls0 ls1 i
 
 (** [loops::list_nth_shared_loop_pair_merge]: loop 0:
-    Source: 'tests/src/loops.rs', lines 251:0-266:1 *)
+    Source: 'tests/src/loops.rs', lines 255:0-270:1 *)
 let rec list_nth_shared_loop_pair_merge_loop
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   Tot (result (t & t))
@@ -398,13 +398,13 @@ let rec list_nth_shared_loop_pair_merge_loop
   end
 
 (** [loops::list_nth_shared_loop_pair_merge]:
-    Source: 'tests/src/loops.rs', lines 251:0-255:19 *)
+    Source: 'tests/src/loops.rs', lines 255:0-259:19 *)
 let list_nth_shared_loop_pair_merge
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) : result (t & t) =
   list_nth_shared_loop_pair_merge_loop t ls0 ls1 i
 
 (** [loops::list_nth_mut_shared_loop_pair]: loop 0:
-    Source: 'tests/src/loops.rs', lines 269:0-284:1 *)
+    Source: 'tests/src/loops.rs', lines 273:0-288:1 *)
 let rec list_nth_mut_shared_loop_pair_loop
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   Tot (result ((t & t) & (t -> result (list_t t))))
@@ -428,7 +428,7 @@ let rec list_nth_mut_shared_loop_pair_loop
   end
 
 (** [loops::list_nth_mut_shared_loop_pair]:
-    Source: 'tests/src/loops.rs', lines 269:0-273:23 *)
+    Source: 'tests/src/loops.rs', lines 273:0-277:23 *)
 let list_nth_mut_shared_loop_pair
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   result ((t & t) & (t -> result (list_t t)))
@@ -436,7 +436,7 @@ let list_nth_mut_shared_loop_pair
   list_nth_mut_shared_loop_pair_loop t ls0 ls1 i
 
 (** [loops::list_nth_mut_shared_loop_pair_merge]: loop 0:
-    Source: 'tests/src/loops.rs', lines 288:0-303:1 *)
+    Source: 'tests/src/loops.rs', lines 292:0-307:1 *)
 let rec list_nth_mut_shared_loop_pair_merge_loop
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   Tot (result ((t & t) & (t -> result (list_t t))))
@@ -461,7 +461,7 @@ let rec list_nth_mut_shared_loop_pair_merge_loop
   end
 
 (** [loops::list_nth_mut_shared_loop_pair_merge]:
-    Source: 'tests/src/loops.rs', lines 288:0-292:23 *)
+    Source: 'tests/src/loops.rs', lines 292:0-296:23 *)
 let list_nth_mut_shared_loop_pair_merge
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   result ((t & t) & (t -> result (list_t t)))
@@ -469,7 +469,7 @@ let list_nth_mut_shared_loop_pair_merge
   list_nth_mut_shared_loop_pair_merge_loop t ls0 ls1 i
 
 (** [loops::list_nth_shared_mut_loop_pair]: loop 0:
-    Source: 'tests/src/loops.rs', lines 307:0-322:1 *)
+    Source: 'tests/src/loops.rs', lines 311:0-326:1 *)
 let rec list_nth_shared_mut_loop_pair_loop
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   Tot (result ((t & t) & (t -> result (list_t t))))
@@ -493,7 +493,7 @@ let rec list_nth_shared_mut_loop_pair_loop
   end
 
 (** [loops::list_nth_shared_mut_loop_pair]:
-    Source: 'tests/src/loops.rs', lines 307:0-311:23 *)
+    Source: 'tests/src/loops.rs', lines 311:0-315:23 *)
 let list_nth_shared_mut_loop_pair
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   result ((t & t) & (t -> result (list_t t)))
@@ -501,7 +501,7 @@ let list_nth_shared_mut_loop_pair
   list_nth_shared_mut_loop_pair_loop t ls0 ls1 i
 
 (** [loops::list_nth_shared_mut_loop_pair_merge]: loop 0:
-    Source: 'tests/src/loops.rs', lines 326:0-341:1 *)
+    Source: 'tests/src/loops.rs', lines 330:0-345:1 *)
 let rec list_nth_shared_mut_loop_pair_merge_loop
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   Tot (result ((t & t) & (t -> result (list_t t))))
@@ -526,7 +526,7 @@ let rec list_nth_shared_mut_loop_pair_merge_loop
   end
 
 (** [loops::list_nth_shared_mut_loop_pair_merge]:
-    Source: 'tests/src/loops.rs', lines 326:0-330:23 *)
+    Source: 'tests/src/loops.rs', lines 330:0-334:23 *)
 let list_nth_shared_mut_loop_pair_merge
   (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) :
   result ((t & t) & (t -> result (list_t t)))
@@ -534,7 +534,7 @@ let list_nth_shared_mut_loop_pair_merge
   list_nth_shared_mut_loop_pair_merge_loop t ls0 ls1 i
 
 (** [loops::ignore_input_mut_borrow]: loop 0:
-    Source: 'tests/src/loops.rs', lines 345:0-349:1 *)
+    Source: 'tests/src/loops.rs', lines 349:0-353:1 *)
 let rec ignore_input_mut_borrow_loop
   (i : u32) :
   Tot (result unit) (decreases (ignore_input_mut_borrow_loop_decreases i))
@@ -544,12 +544,12 @@ let rec ignore_input_mut_borrow_loop
   else Ok ()
 
 (** [loops::ignore_input_mut_borrow]:
-    Source: 'tests/src/loops.rs', lines 345:0-345:56 *)
+    Source: 'tests/src/loops.rs', lines 349:0-349:56 *)
 let ignore_input_mut_borrow (_a : u32) (i : u32) : result u32 =
   let* _ = ignore_input_mut_borrow_loop i in Ok _a
 
 (** [loops::incr_ignore_input_mut_borrow]: loop 0:
-    Source: 'tests/src/loops.rs', lines 353:0-358:1 *)
+    Source: 'tests/src/loops.rs', lines 357:0-362:1 *)
 let rec incr_ignore_input_mut_borrow_loop
   (i : u32) :
   Tot (result unit) (decreases (incr_ignore_input_mut_borrow_loop_decreases i))
@@ -559,14 +559,14 @@ let rec incr_ignore_input_mut_borrow_loop
   else Ok ()
 
 (** [loops::incr_ignore_input_mut_borrow]:
-    Source: 'tests/src/loops.rs', lines 353:0-353:60 *)
+    Source: 'tests/src/loops.rs', lines 357:0-357:60 *)
 let incr_ignore_input_mut_borrow (a : u32) (i : u32) : result u32 =
   let* a1 = u32_add a 1 in
   let* _ = incr_ignore_input_mut_borrow_loop i in
   Ok a1
 
 (** [loops::ignore_input_shared_borrow]: loop 0:
-    Source: 'tests/src/loops.rs', lines 362:0-366:1 *)
+    Source: 'tests/src/loops.rs', lines 366:0-370:1 *)
 let rec ignore_input_shared_borrow_loop
   (i : u32) :
   Tot (result unit) (decreases (ignore_input_shared_borrow_loop_decreases i))
@@ -576,7 +576,7 @@ let rec ignore_input_shared_borrow_loop
   else Ok ()
 
 (** [loops::ignore_input_shared_borrow]:
-    Source: 'tests/src/loops.rs', lines 362:0-362:59 *)
+    Source: 'tests/src/loops.rs', lines 366:0-366:59 *)
 let ignore_input_shared_borrow (_a : u32) (i : u32) : result u32 =
   let* _ = ignore_input_shared_borrow_loop i in Ok _a
 
diff --git a/tests/fstar/misc/Loops.Types.fst b/tests/fstar/misc/Loops.Types.fst
index 534f5df7..c9e2f1cf 100644
--- a/tests/fstar/misc/Loops.Types.fst
+++ b/tests/fstar/misc/Loops.Types.fst
@@ -6,7 +6,7 @@ open Primitives
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [loops::List]
-    Source: 'tests/src/loops.rs', lines 70:0-70:16 *)
+    Source: 'tests/src/loops.rs', lines 74:0-74:16 *)
 type list_t (t : Type0) =
 | List_Cons : t -> list_t t -> list_t t
 | List_Nil : list_t t
diff --git a/tests/fstar/misc/Matches.fst b/tests/fstar/misc/Matches.fst
new file mode 100644
index 00000000..06a9b6df
--- /dev/null
+++ b/tests/fstar/misc/Matches.fst
@@ -0,0 +1,12 @@
+(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
+(** [matches] *)
+module Matches
+open Primitives
+
+#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
+
+(** [matches::match_u32]:
+    Source: 'tests/src/matches.rs', lines 4:0-4:27 *)
+let match_u32 (x : u32) : result u32 =
+  begin match x with | 0 -> Ok 0 | 1 -> Ok 1 | _ -> Ok 2 end
+
diff --git a/tests/fstar/misc/NoNestedBorrows.fst b/tests/fstar/misc/NoNestedBorrows.fst
index 5fd775cb..7506a13b 100644
--- a/tests/fstar/misc/NoNestedBorrows.fst
+++ b/tests/fstar/misc/NoNestedBorrows.fst
@@ -6,54 +6,54 @@ open Primitives
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [no_nested_borrows::Pair]
-    Source: 'tests/src/no_nested_borrows.rs', lines 4:0-4:23 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 7:0-7:23 *)
 type pair_t (t1 t2 : Type0) = { x : t1; y : t2; }
 
 (** [no_nested_borrows::List]
-    Source: 'tests/src/no_nested_borrows.rs', lines 9:0-9:16 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 12:0-12:16 *)
 type list_t (t : Type0) =
 | List_Cons : t -> list_t t -> list_t t
 | List_Nil : list_t t
 
 (** [no_nested_borrows::One]
-    Source: 'tests/src/no_nested_borrows.rs', lines 20:0-20:16 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 23:0-23:16 *)
 type one_t (t1 : Type0) = | One_One : t1 -> one_t t1
 
 (** [no_nested_borrows::EmptyEnum]
-    Source: 'tests/src/no_nested_borrows.rs', lines 26:0-26:18 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 29:0-29:18 *)
 type emptyEnum_t = | EmptyEnum_Empty : emptyEnum_t
 
 (** [no_nested_borrows::Enum]
-    Source: 'tests/src/no_nested_borrows.rs', lines 32:0-32:13 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 35:0-35:13 *)
 type enum_t = | Enum_Variant1 : enum_t | Enum_Variant2 : enum_t
 
 (** [no_nested_borrows::EmptyStruct]
-    Source: 'tests/src/no_nested_borrows.rs', lines 39:0-39:22 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 42:0-42:22 *)
 type emptyStruct_t = unit
 
 (** [no_nested_borrows::Sum]
-    Source: 'tests/src/no_nested_borrows.rs', lines 41:0-41:20 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 44:0-44:20 *)
 type sum_t (t1 t2 : Type0) =
 | Sum_Left : t1 -> sum_t t1 t2
 | Sum_Right : t2 -> sum_t t1 t2
 
 (** [no_nested_borrows::cast_u32_to_i32]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 46:0-46:37 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 49:0-49:37 *)
 let cast_u32_to_i32 (x : u32) : result i32 =
   scalar_cast U32 I32 x
 
 (** [no_nested_borrows::cast_bool_to_i32]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 50:0-50:39 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 53:0-53:39 *)
 let cast_bool_to_i32 (x : bool) : result i32 =
   scalar_cast_bool I32 x
 
 (** [no_nested_borrows::cast_bool_to_bool]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 55:0-55:41 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 58:0-58:41 *)
 let cast_bool_to_bool (x : bool) : result bool =
   Ok x
 
 (** [no_nested_borrows::test2]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 60:0-60:14 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 63:0-63:14 *)
 let test2 : result unit =
   let* _ = u32_add 23 44 in Ok ()
 
@@ -61,12 +61,12 @@ let test2 : result unit =
 let _ = assert_norm (test2 = Ok ())
 
 (** [no_nested_borrows::get_max]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 72:0-72:37 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 75:0-75:37 *)
 let get_max (x : u32) (y : u32) : result u32 =
   if x >= y then Ok x else Ok y
 
 (** [no_nested_borrows::test3]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 80:0-80:14 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 83:0-83:14 *)
 let test3 : result unit =
   let* x = get_max 4 3 in
   let* y = get_max 10 11 in
@@ -77,7 +77,7 @@ let test3 : result unit =
 let _ = assert_norm (test3 = Ok ())
 
 (** [no_nested_borrows::test_neg1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 87:0-87:18 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 90:0-90:18 *)
 let test_neg1 : result unit =
   let* y = i32_neg 3 in if not (y = -3) then Fail Failure else Ok ()
 
@@ -85,7 +85,7 @@ let test_neg1 : result unit =
 let _ = assert_norm (test_neg1 = Ok ())
 
 (** [no_nested_borrows::refs_test1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 94:0-94:19 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 97:0-97:19 *)
 let refs_test1 : result unit =
   if not (1 = 1) then Fail Failure else Ok ()
 
@@ -93,7 +93,7 @@ let refs_test1 : result unit =
 let _ = assert_norm (refs_test1 = Ok ())
 
 (** [no_nested_borrows::refs_test2]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 105:0-105:19 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 108:0-108:19 *)
 let refs_test2 : result unit =
   if not (2 = 2)
   then Fail Failure
@@ -109,7 +109,7 @@ let refs_test2 : result unit =
 let _ = assert_norm (refs_test2 = Ok ())
 
 (** [no_nested_borrows::test_list1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 121:0-121:19 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 124:0-124:19 *)
 let test_list1 : result unit =
   Ok ()
 
@@ -117,7 +117,7 @@ let test_list1 : result unit =
 let _ = assert_norm (test_list1 = Ok ())
 
 (** [no_nested_borrows::test_box1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 126:0-126:18 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 129:0-129:18 *)
 let test_box1 : result unit =
   let* (_, deref_mut_back) = alloc_boxed_Box_deref_mut i32 0 in
   let* b = deref_mut_back 1 in
@@ -128,22 +128,22 @@ let test_box1 : result unit =
 let _ = assert_norm (test_box1 = Ok ())
 
 (** [no_nested_borrows::copy_int]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 136:0-136:30 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 139:0-139:30 *)
 let copy_int (x : i32) : result i32 =
   Ok x
 
 (** [no_nested_borrows::test_unreachable]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 142:0-142:32 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 145:0-145:32 *)
 let test_unreachable (b : bool) : result unit =
   if b then Fail Failure else Ok ()
 
 (** [no_nested_borrows::test_panic]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 150:0-150:26 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 153:0-153:26 *)
 let test_panic (b : bool) : result unit =
   if b then Fail Failure else Ok ()
 
 (** [no_nested_borrows::test_copy_int]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 157:0-157:22 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 160:0-160:22 *)
 let test_copy_int : result unit =
   let* y = copy_int 0 in if not (0 = y) then Fail Failure else Ok ()
 
@@ -151,12 +151,12 @@ let test_copy_int : result unit =
 let _ = assert_norm (test_copy_int = Ok ())
 
 (** [no_nested_borrows::is_cons]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 164:0-164:38 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 167:0-167:38 *)
 let is_cons (t : Type0) (l : list_t t) : result bool =
   begin match l with | List_Cons _ _ -> Ok true | List_Nil -> Ok false end
 
 (** [no_nested_borrows::test_is_cons]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 171:0-171:21 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 174:0-174:21 *)
 let test_is_cons : result unit =
   let* b = is_cons i32 (List_Cons 0 List_Nil) in
   if not b then Fail Failure else Ok ()
@@ -165,7 +165,7 @@ let test_is_cons : result unit =
 let _ = assert_norm (test_is_cons = Ok ())
 
 (** [no_nested_borrows::split_list]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 177:0-177:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 180:0-180:48 *)
 let split_list (t : Type0) (l : list_t t) : result (t & (list_t t)) =
   begin match l with
   | List_Cons hd tl -> Ok (hd, tl)
@@ -173,7 +173,7 @@ let split_list (t : Type0) (l : list_t t) : result (t & (list_t t)) =
   end
 
 (** [no_nested_borrows::test_split_list]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 185:0-185:24 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 188:0-188:24 *)
 let test_split_list : result unit =
   let* p = split_list i32 (List_Cons 0 List_Nil) in
   let (hd, _) = p in
@@ -183,7 +183,7 @@ let test_split_list : result unit =
 let _ = assert_norm (test_split_list = Ok ())
 
 (** [no_nested_borrows::choose]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 192:0-192:70 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 195:0-195:70 *)
 let choose
   (t : Type0) (b : bool) (x : t) (y : t) : result (t & (t -> result (t & t))) =
   if b
@@ -191,7 +191,7 @@ let choose
   else let back = fun ret -> Ok (x, ret) in Ok (y, back)
 
 (** [no_nested_borrows::choose_test]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 200:0-200:20 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 203:0-203:20 *)
 let choose_test : result unit =
   let* (z, choose_back) = choose i32 true 0 0 in
   let* z1 = i32_add z 1 in
@@ -207,29 +207,29 @@ let choose_test : result unit =
 let _ = assert_norm (choose_test = Ok ())
 
 (** [no_nested_borrows::test_char]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 212:0-212:26 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 215:0-215:26 *)
 let test_char : result char =
   Ok 'a'
 
 (** [no_nested_borrows::panic_mut_borrow]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 217:0-217:36 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 220:0-220:36 *)
 let panic_mut_borrow (i : u32) : result u32 =
   Fail Failure
 
 (** [no_nested_borrows::Tree]
-    Source: 'tests/src/no_nested_borrows.rs', lines 222:0-222:16 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 225:0-225:16 *)
 type tree_t (t : Type0) =
 | Tree_Leaf : t -> tree_t t
 | Tree_Node : t -> nodeElem_t t -> tree_t t -> tree_t t
 
 (** [no_nested_borrows::NodeElem]
-    Source: 'tests/src/no_nested_borrows.rs', lines 227:0-227:20 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 230:0-230:20 *)
 and nodeElem_t (t : Type0) =
 | NodeElem_Cons : tree_t t -> nodeElem_t t -> nodeElem_t t
 | NodeElem_Nil : nodeElem_t t
 
 (** [no_nested_borrows::list_length]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 262:0-262:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 265:0-265:48 *)
 let rec list_length (t : Type0) (l : list_t t) : result u32 =
   begin match l with
   | List_Cons _ l1 -> let* i = list_length t l1 in u32_add 1 i
@@ -237,7 +237,7 @@ let rec list_length (t : Type0) (l : list_t t) : result u32 =
   end
 
 (** [no_nested_borrows::list_nth_shared]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 270:0-270:62 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 273:0-273:62 *)
 let rec list_nth_shared (t : Type0) (l : list_t t) (i : u32) : result t =
   begin match l with
   | List_Cons x tl ->
@@ -246,7 +246,7 @@ let rec list_nth_shared (t : Type0) (l : list_t t) (i : u32) : result t =
   end
 
 (** [no_nested_borrows::list_nth_mut]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 286:0-286:67 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 289:0-289:67 *)
 let rec list_nth_mut
   (t : Type0) (l : list_t t) (i : u32) :
   result (t & (t -> result (list_t t)))
@@ -265,7 +265,7 @@ let rec list_nth_mut
   end
 
 (** [no_nested_borrows::list_rev_aux]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 302:0-302:63 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 305:0-305:63 *)
 let rec list_rev_aux
   (t : Type0) (li : list_t t) (lo : list_t t) : result (list_t t) =
   begin match li with
@@ -274,13 +274,13 @@ let rec list_rev_aux
   end
 
 (** [no_nested_borrows::list_rev]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 316:0-316:42 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 319:0-319:42 *)
 let list_rev (t : Type0) (l : list_t t) : result (list_t t) =
   let (li, _) = core_mem_replace (list_t t) l List_Nil in
   list_rev_aux t li List_Nil
 
 (** [no_nested_borrows::test_list_functions]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 321:0-321:28 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 324:0-324:28 *)
 let test_list_functions : result unit =
   let l = List_Cons 2 List_Nil in
   let l1 = List_Cons 1 l in
@@ -317,7 +317,7 @@ let test_list_functions : result unit =
 let _ = assert_norm (test_list_functions = Ok ())
 
 (** [no_nested_borrows::id_mut_pair1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 337:0-337:89 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 340:0-340:89 *)
 let id_mut_pair1
   (t1 t2 : Type0) (x : t1) (y : t2) :
   result ((t1 & t2) & ((t1 & t2) -> result (t1 & t2)))
@@ -325,7 +325,7 @@ let id_mut_pair1
   Ok ((x, y), Ok)
 
 (** [no_nested_borrows::id_mut_pair2]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 341:0-341:88 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 344:0-344:88 *)
 let id_mut_pair2
   (t1 t2 : Type0) (p : (t1 & t2)) :
   result ((t1 & t2) & ((t1 & t2) -> result (t1 & t2)))
@@ -333,7 +333,7 @@ let id_mut_pair2
   let (x, x1) = p in Ok ((x, x1), Ok)
 
 (** [no_nested_borrows::id_mut_pair3]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 345:0-345:93 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 348:0-348:93 *)
 let id_mut_pair3
   (t1 t2 : Type0) (x : t1) (y : t2) :
   result ((t1 & t2) & (t1 -> result t1) & (t2 -> result t2))
@@ -341,7 +341,7 @@ let id_mut_pair3
   Ok ((x, y), Ok, Ok)
 
 (** [no_nested_borrows::id_mut_pair4]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 349:0-349:92 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 352:0-352:92 *)
 let id_mut_pair4
   (t1 t2 : Type0) (p : (t1 & t2)) :
   result ((t1 & t2) & (t1 -> result t1) & (t2 -> result t2))
@@ -349,35 +349,35 @@ let id_mut_pair4
   let (x, x1) = p in Ok ((x, x1), Ok, Ok)
 
 (** [no_nested_borrows::StructWithTuple]
-    Source: 'tests/src/no_nested_borrows.rs', lines 356:0-356:34 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 359:0-359:34 *)
 type structWithTuple_t (t1 t2 : Type0) = { p : (t1 & t2); }
 
 (** [no_nested_borrows::new_tuple1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 360:0-360:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 363:0-363:48 *)
 let new_tuple1 : result (structWithTuple_t u32 u32) =
   Ok { p = (1, 2) }
 
 (** [no_nested_borrows::new_tuple2]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 364:0-364:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 367:0-367:48 *)
 let new_tuple2 : result (structWithTuple_t i16 i16) =
   Ok { p = (1, 2) }
 
 (** [no_nested_borrows::new_tuple3]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 368:0-368:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 371:0-371:48 *)
 let new_tuple3 : result (structWithTuple_t u64 i64) =
   Ok { p = (1, 2) }
 
 (** [no_nested_borrows::StructWithPair]
-    Source: 'tests/src/no_nested_borrows.rs', lines 373:0-373:33 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 376:0-376:33 *)
 type structWithPair_t (t1 t2 : Type0) = { p : pair_t t1 t2; }
 
 (** [no_nested_borrows::new_pair1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 377:0-377:46 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 380:0-380:46 *)
 let new_pair1 : result (structWithPair_t u32 u32) =
   Ok { p = { x = 1; y = 2 } }
 
 (** [no_nested_borrows::test_constants]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 385:0-385:23 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 388:0-388:23 *)
 let test_constants : result unit =
   let* swt = new_tuple1 in
   let (i, _) = swt.p in
@@ -401,7 +401,7 @@ let test_constants : result unit =
 let _ = assert_norm (test_constants = Ok ())
 
 (** [no_nested_borrows::test_weird_borrows1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 394:0-394:28 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 397:0-397:28 *)
 let test_weird_borrows1 : result unit =
   Ok ()
 
@@ -409,71 +409,71 @@ let test_weird_borrows1 : result unit =
 let _ = assert_norm (test_weird_borrows1 = Ok ())
 
 (** [no_nested_borrows::test_mem_replace]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 404:0-404:37 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 407:0-407:37 *)
 let test_mem_replace (px : u32) : result u32 =
   let (y, _) = core_mem_replace u32 px 1 in
   if not (y = 0) then Fail Failure else Ok 2
 
 (** [no_nested_borrows::test_shared_borrow_bool1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 411:0-411:47 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 414:0-414:47 *)
 let test_shared_borrow_bool1 (b : bool) : result u32 =
   if b then Ok 0 else Ok 1
 
 (** [no_nested_borrows::test_shared_borrow_bool2]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 424:0-424:40 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 427:0-427:40 *)
 let test_shared_borrow_bool2 : result u32 =
   Ok 0
 
 (** [no_nested_borrows::test_shared_borrow_enum1]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 439:0-439:52 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 442:0-442:52 *)
 let test_shared_borrow_enum1 (l : list_t u32) : result u32 =
   begin match l with | List_Cons _ _ -> Ok 1 | List_Nil -> Ok 0 end
 
 (** [no_nested_borrows::test_shared_borrow_enum2]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 451:0-451:40 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 454:0-454:40 *)
 let test_shared_borrow_enum2 : result u32 =
   Ok 0
 
 (** [no_nested_borrows::incr]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 462:0-462:24 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 465:0-465:24 *)
 let incr (x : u32) : result u32 =
   u32_add x 1
 
 (** [no_nested_borrows::call_incr]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 466:0-466:35 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 469:0-469:35 *)
 let call_incr (x : u32) : result u32 =
   incr x
 
 (** [no_nested_borrows::read_then_incr]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 471:0-471:41 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 474:0-474:41 *)
 let read_then_incr (x : u32) : result (u32 & u32) =
   let* x1 = u32_add x 1 in Ok (x, x1)
 
 (** [no_nested_borrows::Tuple]
-    Source: 'tests/src/no_nested_borrows.rs', lines 477:0-477:24 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 480:0-480:24 *)
 type tuple_t (t1 t2 : Type0) = t1 * t2
 
 (** [no_nested_borrows::use_tuple_struct]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 479:0-479:48 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 482:0-482:48 *)
 let use_tuple_struct (x : tuple_t u32 u32) : result (tuple_t u32 u32) =
   let (_, i) = x in Ok (1, i)
 
 (** [no_nested_borrows::create_tuple_struct]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 483:0-483:61 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 486:0-486:61 *)
 let create_tuple_struct (x : u32) (y : u64) : result (tuple_t u32 u64) =
   Ok (x, y)
 
 (** [no_nested_borrows::IdType]
-    Source: 'tests/src/no_nested_borrows.rs', lines 488:0-488:20 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 491:0-491:20 *)
 type idType_t (t : Type0) = t
 
 (** [no_nested_borrows::use_id_type]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 490:0-490:40 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 493:0-493:40 *)
 let use_id_type (t : Type0) (x : idType_t t) : result t =
   Ok x
 
 (** [no_nested_borrows::create_id_type]:
-    Source: 'tests/src/no_nested_borrows.rs', lines 494:0-494:43 *)
+    Source: 'tests/src/no_nested_borrows.rs', lines 497:0-497:43 *)
 let create_id_type (t : Type0) (x : t) : result (idType_t t) =
   Ok x
 
diff --git a/tests/fstar/misc/Paper.fst b/tests/fstar/misc/Paper.fst
index 2e74e21a..e2412076 100644
--- a/tests/fstar/misc/Paper.fst
+++ b/tests/fstar/misc/Paper.fst
@@ -6,12 +6,12 @@ open Primitives
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [paper::ref_incr]:
-    Source: 'tests/src/paper.rs', lines 4:0-4:28 *)
+    Source: 'tests/src/paper.rs', lines 7:0-7:28 *)
 let ref_incr (x : i32) : result i32 =
   i32_add x 1
 
 (** [paper::test_incr]:
-    Source: 'tests/src/paper.rs', lines 8:0-8:18 *)
+    Source: 'tests/src/paper.rs', lines 11:0-11:18 *)
 let test_incr : result unit =
   let* x = ref_incr 0 in if not (x = 1) then Fail Failure else Ok ()
 
@@ -19,7 +19,7 @@ let test_incr : result unit =
 let _ = assert_norm (test_incr = Ok ())
 
 (** [paper::choose]:
-    Source: 'tests/src/paper.rs', lines 15:0-15:70 *)
+    Source: 'tests/src/paper.rs', lines 18:0-18:70 *)
 let choose
   (t : Type0) (b : bool) (x : t) (y : t) : result (t & (t -> result (t & t))) =
   if b
@@ -27,7 +27,7 @@ let choose
   else let back = fun ret -> Ok (x, ret) in Ok (y, back)
 
 (** [paper::test_choose]:
-    Source: 'tests/src/paper.rs', lines 23:0-23:20 *)
+    Source: 'tests/src/paper.rs', lines 26:0-26:20 *)
 let test_choose : result unit =
   let* (z, choose_back) = choose i32 true 0 0 in
   let* z1 = i32_add z 1 in
@@ -43,13 +43,13 @@ let test_choose : result unit =
 let _ = assert_norm (test_choose = Ok ())
 
 (** [paper::List]
-    Source: 'tests/src/paper.rs', lines 35:0-35:16 *)
+    Source: 'tests/src/paper.rs', lines 38:0-38:16 *)
 type list_t (t : Type0) =
 | List_Cons : t -> list_t t -> list_t t
 | List_Nil : list_t t
 
 (** [paper::list_nth_mut]:
-    Source: 'tests/src/paper.rs', lines 42:0-42:67 *)
+    Source: 'tests/src/paper.rs', lines 45:0-45:67 *)
 let rec list_nth_mut
   (t : Type0) (l : list_t t) (i : u32) :
   result (t & (t -> result (list_t t)))
@@ -68,7 +68,7 @@ let rec list_nth_mut
   end
 
 (** [paper::sum]:
-    Source: 'tests/src/paper.rs', lines 57:0-57:32 *)
+    Source: 'tests/src/paper.rs', lines 60:0-60:32 *)
 let rec sum (l : list_t i32) : result i32 =
   begin match l with
   | List_Cons x tl -> let* i = sum tl in i32_add x i
@@ -76,7 +76,7 @@ let rec sum (l : list_t i32) : result i32 =
   end
 
 (** [paper::test_nth]:
-    Source: 'tests/src/paper.rs', lines 68:0-68:17 *)
+    Source: 'tests/src/paper.rs', lines 71:0-71:17 *)
 let test_nth : result unit =
   let l = List_Cons 3 List_Nil in
   let l1 = List_Cons 2 l in
@@ -90,7 +90,7 @@ let test_nth : result unit =
 let _ = assert_norm (test_nth = Ok ())
 
 (** [paper::call_choose]:
-    Source: 'tests/src/paper.rs', lines 76:0-76:44 *)
+    Source: 'tests/src/paper.rs', lines 79:0-79:44 *)
 let call_choose (p : (u32 & u32)) : result u32 =
   let (px, py) = p in
   let* (pz, choose_back) = choose u32 true px py in
diff --git a/tests/fstar/misc/PoloniusList.fst b/tests/fstar/misc/PoloniusList.fst
index 071fd3ef..810388db 100644
--- a/tests/fstar/misc/PoloniusList.fst
+++ b/tests/fstar/misc/PoloniusList.fst
@@ -6,13 +6,13 @@ open Primitives
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** [polonius_list::List]
-    Source: 'tests/src/polonius_list.rs', lines 3:0-3:16 *)
+    Source: 'tests/src/polonius_list.rs', lines 6:0-6:16 *)
 type list_t (t : Type0) =
 | List_Cons : t -> list_t t -> list_t t
 | List_Nil : list_t t
 
 (** [polonius_list::get_list_at_x]:
-    Source: 'tests/src/polonius_list.rs', lines 13:0-13:76 *)
+    Source: 'tests/src/polonius_list.rs', lines 16:0-16:76 *)
 let rec get_list_at_x
   (ls : list_t u32) (x : u32) :
   result ((list_t u32) & (list_t u32 -> result (list_t u32)))
diff --git a/tests/fstar/traits/Traits.fst b/tests/fstar/traits/Traits.fst
index fa841e8a..70c345ba 100644
--- a/tests/fstar/traits/Traits.fst
+++ b/tests/fstar/traits/Traits.fst
@@ -6,20 +6,20 @@ open Primitives
 #set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
 
 (** Trait declaration: [traits::BoolTrait]
-    Source: 'tests/src/traits.rs', lines 1:0-1:19 *)
+    Source: 'tests/src/traits.rs', lines 2:0-2:19 *)
 noeq type boolTrait_t (self : Type0) = { get_bool : self -> result bool; }
 
 (** [traits::{(traits::BoolTrait for bool)}::get_bool]:
-    Source: 'tests/src/traits.rs', lines 12:4-12:30 *)
+    Source: 'tests/src/traits.rs', lines 13:4-13:30 *)
 let boolTraitBool_get_bool (self : bool) : result bool =
   Ok self
 
 (** Trait implementation: [traits::{(traits::BoolTrait for bool)}]
-    Source: 'tests/src/traits.rs', lines 11:0-11:23 *)
+    Source: 'tests/src/traits.rs', lines 12:0-12:23 *)
 let boolTraitBool : boolTrait_t bool = { get_bool = boolTraitBool_get_bool; }
 
 (** [traits::BoolTrait::ret_true]:
-    Source: 'tests/src/traits.rs', lines 6:4-6:30 *)
+    Source: 'tests/src/traits.rs', lines 7:4-7:30 *)
 let boolTrait_ret_true
   (#self : Type0) (self_clause : boolTrait_t self) (self1 : self) :
   result bool
@@ -27,49 +27,49 @@ let boolTrait_ret_true
   Ok true
 
 (** [traits::test_bool_trait_bool]:
-    Source: 'tests/src/traits.rs', lines 17:0-17:44 *)
+    Source: 'tests/src/traits.rs', lines 18:0-18:44 *)
 let test_bool_trait_bool (x : bool) : result bool =
   let* b = boolTraitBool_get_bool x in
   if b then boolTrait_ret_true boolTraitBool x else Ok false
 
 (** [traits::{(traits::BoolTrait for core::option::Option<T>)#1}::get_bool]:
-    Source: 'tests/src/traits.rs', lines 23:4-23:30 *)
+    Source: 'tests/src/traits.rs', lines 24:4-24:30 *)
 let boolTraitOption_get_bool (t : Type0) (self : option t) : result bool =
   begin match self with | None -> Ok false | Some _ -> Ok true end
 
 (** Trait implementation: [traits::{(traits::BoolTrait for core::option::Option<T>)#1}]
-    Source: 'tests/src/traits.rs', lines 22:0-22:31 *)
+    Source: 'tests/src/traits.rs', lines 23:0-23:31 *)
 let boolTraitOption (t : Type0) : boolTrait_t (option t) = {
   get_bool = boolTraitOption_get_bool t;
 }
 
 (** [traits::test_bool_trait_option]:
-    Source: 'tests/src/traits.rs', lines 31:0-31:54 *)
+    Source: 'tests/src/traits.rs', lines 32:0-32:54 *)
 let test_bool_trait_option (t : Type0) (x : option t) : result bool =
   let* b = boolTraitOption_get_bool t x in
   if b then boolTrait_ret_true (boolTraitOption t) x else Ok false
 
 (** [traits::test_bool_trait]:
-    Source: 'tests/src/traits.rs', lines 35:0-35:50 *)
+    Source: 'tests/src/traits.rs', lines 36:0-36:50 *)
 let test_bool_trait
   (t : Type0) (boolTraitInst : boolTrait_t t) (x : t) : result bool =
   boolTraitInst.get_bool x
 
 (** Trait declaration: [traits::ToU64]
-    Source: 'tests/src/traits.rs', lines 39:0-39:15 *)
+    Source: 'tests/src/traits.rs', lines 40:0-40:15 *)
 noeq type toU64_t (self : Type0) = { to_u64 : self -> result u64; }
 
 (** [traits::{(traits::ToU64 for u64)#2}::to_u64]:
-    Source: 'tests/src/traits.rs', lines 44:4-44:26 *)
+    Source: 'tests/src/traits.rs', lines 45:4-45:26 *)
 let toU64U64_to_u64 (self : u64) : result u64 =
   Ok self
 
 (** Trait implementation: [traits::{(traits::ToU64 for u64)#2}]
-    Source: 'tests/src/traits.rs', lines 43:0-43:18 *)
+    Source: 'tests/src/traits.rs', lines 44:0-44:18 *)
 let toU64U64 : toU64_t u64 = { to_u64 = toU64U64_to_u64; }
 
 (** [traits::{(traits::ToU64 for (A, A))#3}::to_u64]:
-    Source: 'tests/src/traits.rs', lines 50:4-50:26 *)
+    Source: 'tests/src/traits.rs', lines 51:4-51:26 *)
 let toU64Pair_to_u64
   (a : Type0) (toU64Inst : toU64_t a) (self : (a & a)) : result u64 =
   let (x, x1) = self in
@@ -78,75 +78,75 @@ let toU64Pair_to_u64
   u64_add i i1
 
 (** Trait implementation: [traits::{(traits::ToU64 for (A, A))#3}]
-    Source: 'tests/src/traits.rs', lines 49:0-49:31 *)
+    Source: 'tests/src/traits.rs', lines 50:0-50:31 *)
 let toU64Pair (a : Type0) (toU64Inst : toU64_t a) : toU64_t (a & a) = {
   to_u64 = toU64Pair_to_u64 a toU64Inst;
 }
 
 (** [traits::f]:
-    Source: 'tests/src/traits.rs', lines 55:0-55:36 *)
+    Source: 'tests/src/traits.rs', lines 56:0-56:36 *)
 let f (t : Type0) (toU64Inst : toU64_t t) (x : (t & t)) : result u64 =
   toU64Pair_to_u64 t toU64Inst x
 
 (** [traits::g]:
-    Source: 'tests/src/traits.rs', lines 59:0-61:18 *)
+    Source: 'tests/src/traits.rs', lines 60:0-62:18 *)
 let g
   (t : Type0) (toU64PairInst : toU64_t (t & t)) (x : (t & t)) : result u64 =
   toU64PairInst.to_u64 x
 
 (** [traits::h0]:
-    Source: 'tests/src/traits.rs', lines 66:0-66:24 *)
+    Source: 'tests/src/traits.rs', lines 67:0-67:24 *)
 let h0 (x : u64) : result u64 =
   toU64U64_to_u64 x
 
 (** [traits::Wrapper]
-    Source: 'tests/src/traits.rs', lines 70:0-70:21 *)
+    Source: 'tests/src/traits.rs', lines 71:0-71:21 *)
 type wrapper_t (t : Type0) = { x : t; }
 
 (** [traits::{(traits::ToU64 for traits::Wrapper<T>)#4}::to_u64]:
-    Source: 'tests/src/traits.rs', lines 75:4-75:26 *)
+    Source: 'tests/src/traits.rs', lines 76:4-76:26 *)
 let toU64traitsWrapper_to_u64
   (t : Type0) (toU64Inst : toU64_t t) (self : wrapper_t t) : result u64 =
   toU64Inst.to_u64 self.x
 
 (** Trait implementation: [traits::{(traits::ToU64 for traits::Wrapper<T>)#4}]
-    Source: 'tests/src/traits.rs', lines 74:0-74:35 *)
+    Source: 'tests/src/traits.rs', lines 75:0-75:35 *)
 let toU64traitsWrapper (t : Type0) (toU64Inst : toU64_t t) : toU64_t (wrapper_t
   t) = {
   to_u64 = toU64traitsWrapper_to_u64 t toU64Inst;
 }
 
 (** [traits::h1]:
-    Source: 'tests/src/traits.rs', lines 80:0-80:33 *)
+    Source: 'tests/src/traits.rs', lines 81:0-81:33 *)
 let h1 (x : wrapper_t u64) : result u64 =
   toU64traitsWrapper_to_u64 u64 toU64U64 x
 
 (** [traits::h2]:
-    Source: 'tests/src/traits.rs', lines 84:0-84:41 *)
+    Source: 'tests/src/traits.rs', lines 85:0-85:41 *)
 let h2 (t : Type0) (toU64Inst : toU64_t t) (x : wrapper_t t) : result u64 =
   toU64traitsWrapper_to_u64 t toU64Inst x
 
 (** Trait declaration: [traits::ToType]
-    Source: 'tests/src/traits.rs', lines 88:0-88:19 *)
+    Source: 'tests/src/traits.rs', lines 89:0-89:19 *)
 noeq type toType_t (self t : Type0) = { to_type : self -> result t; }
 
 (** [traits::{(traits::ToType<bool> for u64)#5}::to_type]:
-    Source: 'tests/src/traits.rs', lines 93:4-93:28 *)
+    Source: 'tests/src/traits.rs', lines 94:4-94:28 *)
 let toTypeU64Bool_to_type (self : u64) : result bool =
   Ok (self > 0)
 
 (** Trait implementation: [traits::{(traits::ToType<bool> for u64)#5}]
-    Source: 'tests/src/traits.rs', lines 92:0-92:25 *)
+    Source: 'tests/src/traits.rs', lines 93:0-93:25 *)
 let toTypeU64Bool : toType_t u64 bool = { to_type = toTypeU64Bool_to_type; }
 
 (** Trait declaration: [traits::OfType]
-    Source: 'tests/src/traits.rs', lines 98:0-98:16 *)
+    Source: 'tests/src/traits.rs', lines 99:0-99:16 *)
 noeq type ofType_t (self : Type0) = {
   of_type : (t : Type0) -> (toTypeInst : toType_t t self) -> t -> result self;
 }
 
 (** [traits::h3]:
-    Source: 'tests/src/traits.rs', lines 104:0-104:50 *)
+    Source: 'tests/src/traits.rs', lines 105:0-105:50 *)
 let h3
   (t1 t2 : Type0) (ofTypeInst : ofType_t t1) (toTypeInst : toType_t t2 t1)
   (y : t2) :
@@ -155,14 +155,14 @@ let h3
   ofTypeInst.of_type t2 toTypeInst y
 
 (** Trait declaration: [traits::OfTypeBis]
-    Source: 'tests/src/traits.rs', lines 109:0-109:36 *)
+    Source: 'tests/src/traits.rs', lines 110:0-110:36 *)
 noeq type ofTypeBis_t (self t : Type0) = {
   toTypeInst : toType_t t self;
   of_type : t -> result self;
 }
 
 (** [traits::h4]:
-    Source: 'tests/src/traits.rs', lines 118:0-118:57 *)
+    Source: 'tests/src/traits.rs', lines 119:0-119:57 *)
 let h4
   (t1 t2 : Type0) (ofTypeBisInst : ofTypeBis_t t1 t2) (toTypeInst : toType_t t2
   t1) (y : t2) :
@@ -171,34 +171,34 @@ let h4
   ofTypeBisInst.of_type y
 
 (** [traits::TestType]
-    Source: 'tests/src/traits.rs', lines 122:0-122:22 *)
+    Source: 'tests/src/traits.rs', lines 123:0-123:22 *)
 type testType_t (t : Type0) = t
 
 (** [traits::{traits::TestType<T>#6}::test::TestType1]
-    Source: 'tests/src/traits.rs', lines 127:8-127:24 *)
+    Source: 'tests/src/traits.rs', lines 128:8-128:24 *)
 type testType_test_TestType1_t = u64
 
 (** Trait declaration: [traits::{traits::TestType<T>#6}::test::TestTrait]
-    Source: 'tests/src/traits.rs', lines 128:8-128:23 *)
+    Source: 'tests/src/traits.rs', lines 129:8-129:23 *)
 noeq type testType_test_TestTrait_t (self : Type0) = {
   test : self -> result bool;
 }
 
 (** [traits::{traits::TestType<T>#6}::test::{(traits::{traits::TestType<T>#6}::test::TestTrait for traits::{traits::TestType<T>#6}::test::TestType1)}::test]:
-    Source: 'tests/src/traits.rs', lines 139:12-139:34 *)
+    Source: 'tests/src/traits.rs', lines 140:12-140:34 *)
 let testType_test_TestTraittraitsTestTypetestTestType1_test
   (self : testType_test_TestType1_t) : result bool =
   Ok (self > 1)
 
 (** Trait implementation: [traits::{traits::TestType<T>#6}::test::{(traits::{traits::TestType<T>#6}::test::TestTrait for traits::{traits::TestType<T>#6}::test::TestType1)}]
-    Source: 'tests/src/traits.rs', lines 138:8-138:36 *)
+    Source: 'tests/src/traits.rs', lines 139:8-139:36 *)
 let testType_test_TestTraittraitsTestTypetestTestType1 :
   testType_test_TestTrait_t testType_test_TestType1_t = {
   test = testType_test_TestTraittraitsTestTypetestTestType1_test;
 }
 
 (** [traits::{traits::TestType<T>#6}::test]:
-    Source: 'tests/src/traits.rs', lines 126:4-126:36 *)
+    Source: 'tests/src/traits.rs', lines 127:4-127:36 *)
 let testType_test
   (t : Type0) (toU64Inst : toU64_t t) (self : testType_t t) (x : t) :
   result bool
@@ -209,11 +209,11 @@ let testType_test
   else Ok false
 
 (** [traits::BoolWrapper]
-    Source: 'tests/src/traits.rs', lines 150:0-150:22 *)
+    Source: 'tests/src/traits.rs', lines 151:0-151:22 *)
 type boolWrapper_t = bool
 
 (** [traits::{(traits::ToType<T> for traits::BoolWrapper)#7}::to_type]:
-    Source: 'tests/src/traits.rs', lines 156:4-156:25 *)
+    Source: 'tests/src/traits.rs', lines 157:4-157:25 *)
 let toTypetraitsBoolWrapperT_to_type
   (t : Type0) (toTypeBoolTInst : toType_t bool t) (self : boolWrapper_t) :
   result t
@@ -221,14 +221,14 @@ let toTypetraitsBoolWrapperT_to_type
   toTypeBoolTInst.to_type self
 
 (** Trait implementation: [traits::{(traits::ToType<T> for traits::BoolWrapper)#7}]
-    Source: 'tests/src/traits.rs', lines 152:0-152:33 *)
+    Source: 'tests/src/traits.rs', lines 153:0-153:33 *)
 let toTypetraitsBoolWrapperT (t : Type0) (toTypeBoolTInst : toType_t bool t) :
   toType_t boolWrapper_t t = {
   to_type = toTypetraitsBoolWrapperT_to_type t toTypeBoolTInst;
 }
 
 (** [traits::WithConstTy::LEN2]
-    Source: 'tests/src/traits.rs', lines 164:4-164:21 *)
+    Source: 'tests/src/traits.rs', lines 165:4-165:21 *)
 let with_const_ty_len2_default_body (self : Type0) (len : usize)
   : result usize =
   Ok 32
@@ -236,7 +236,7 @@ let with_const_ty_len2_default (self : Type0) (len : usize) : usize =
   eval_global (with_const_ty_len2_default_body self len)
 
 (** Trait declaration: [traits::WithConstTy]
-    Source: 'tests/src/traits.rs', lines 161:0-161:39 *)
+    Source: 'tests/src/traits.rs', lines 162:0-162:39 *)
 noeq type withConstTy_t (self : Type0) (len : usize) = {
   cLEN1 : usize;
   cLEN2 : usize;
@@ -247,18 +247,18 @@ noeq type withConstTy_t (self : Type0) (len : usize) = {
 }
 
 (** [traits::{(traits::WithConstTy<32: usize> for bool)#8}::LEN1]
-    Source: 'tests/src/traits.rs', lines 175:4-175:21 *)
+    Source: 'tests/src/traits.rs', lines 176:4-176:21 *)
 let with_const_ty_bool32_len1_body : result usize = Ok 12
 let with_const_ty_bool32_len1 : usize =
   eval_global with_const_ty_bool32_len1_body
 
 (** [traits::{(traits::WithConstTy<32: usize> for bool)#8}::f]:
-    Source: 'tests/src/traits.rs', lines 180:4-180:39 *)
+    Source: 'tests/src/traits.rs', lines 181:4-181:39 *)
 let withConstTyBool32_f (i : u64) (a : array u8 32) : result u64 =
   Ok i
 
 (** Trait implementation: [traits::{(traits::WithConstTy<32: usize> for bool)#8}]
-    Source: 'tests/src/traits.rs', lines 174:0-174:29 *)
+    Source: 'tests/src/traits.rs', lines 175:0-175:29 *)
 let withConstTyBool32 : withConstTy_t bool 32 = {
   cLEN1 = with_const_ty_bool32_len1;
   cLEN2 = with_const_ty_len2_default bool 32;
@@ -269,7 +269,7 @@ let withConstTyBool32 : withConstTy_t bool 32 = {
 }
 
 (** [traits::use_with_const_ty1]:
-    Source: 'tests/src/traits.rs', lines 183:0-183:75 *)
+    Source: 'tests/src/traits.rs', lines 184:0-184:75 *)
 let use_with_const_ty1
   (h : Type0) (len : usize) (withConstTyInst : withConstTy_t h len) :
   result usize
@@ -277,7 +277,7 @@ let use_with_const_ty1
   Ok withConstTyInst.cLEN1
 
 (** [traits::use_with_const_ty2]:
-    Source: 'tests/src/traits.rs', lines 187:0-187:73 *)
+    Source: 'tests/src/traits.rs', lines 188:0-188:73 *)
 let use_with_const_ty2
   (h : Type0) (len : usize) (withConstTyInst : withConstTy_t h len)
   (w : withConstTyInst.tW) :
@@ -286,7 +286,7 @@ let use_with_const_ty2
   Ok ()
 
 (** [traits::use_with_const_ty3]:
-    Source: 'tests/src/traits.rs', lines 189:0-189:80 *)
+    Source: 'tests/src/traits.rs', lines 190:0-190:80 *)
 let use_with_const_ty3
   (h : Type0) (len : usize) (withConstTyInst : withConstTy_t h len)
   (x : withConstTyInst.tW) :
@@ -295,12 +295,12 @@ let use_with_const_ty3
   withConstTyInst.tW_clause_0.to_u64 x
 
 (** [traits::test_where1]:
-    Source: 'tests/src/traits.rs', lines 193:0-193:40 *)
+    Source: 'tests/src/traits.rs', lines 194:0-194:40 *)
 let test_where1 (t : Type0) (_x : t) : result unit =
   Ok ()
 
 (** [traits::test_where2]:
-    Source: 'tests/src/traits.rs', lines 194:0-194:57 *)
+    Source: 'tests/src/traits.rs', lines 195:0-195:57 *)
 let test_where2
   (t : Type0) (withConstTyT32Inst : withConstTy_t t 32) (_x : u32) :
   result unit
@@ -308,7 +308,7 @@ let test_where2
   Ok ()
 
 (** Trait declaration: [traits::ParentTrait0]
-    Source: 'tests/src/traits.rs', lines 200:0-200:22 *)
+    Source: 'tests/src/traits.rs', lines 201:0-201:22 *)
 noeq type parentTrait0_t (self : Type0) = {
   tW : Type0;
   get_name : self -> result string;
@@ -316,24 +316,24 @@ noeq type parentTrait0_t (self : Type0) = {
 }
 
 (** Trait declaration: [traits::ParentTrait1]
-    Source: 'tests/src/traits.rs', lines 205:0-205:22 *)
+    Source: 'tests/src/traits.rs', lines 206:0-206:22 *)
 type parentTrait1_t (self : Type0) = unit
 
 (** Trait declaration: [traits::ChildTrait]
-    Source: 'tests/src/traits.rs', lines 206:0-206:49 *)
+    Source: 'tests/src/traits.rs', lines 207:0-207:49 *)
 noeq type childTrait_t (self : Type0) = {
   parentTrait0Inst : parentTrait0_t self;
   parentTrait1Inst : parentTrait1_t self;
 }
 
 (** [traits::test_child_trait1]:
-    Source: 'tests/src/traits.rs', lines 209:0-209:56 *)
+    Source: 'tests/src/traits.rs', lines 210:0-210:56 *)
 let test_child_trait1
   (t : Type0) (childTraitInst : childTrait_t t) (x : t) : result string =
   childTraitInst.parentTrait0Inst.get_name x
 
 (** [traits::test_child_trait2]:
-    Source: 'tests/src/traits.rs', lines 213:0-213:54 *)
+    Source: 'tests/src/traits.rs', lines 214:0-214:54 *)
 let test_child_trait2
   (t : Type0) (childTraitInst : childTrait_t t) (x : t) :
   result childTraitInst.parentTrait0Inst.tW
@@ -341,7 +341,7 @@ let test_child_trait2
   childTraitInst.parentTrait0Inst.get_w x
 
 (** [traits::order1]:
-    Source: 'tests/src/traits.rs', lines 219:0-219:59 *)
+    Source: 'tests/src/traits.rs', lines 220:0-220:59 *)
 let order1
   (t u : Type0) (parentTrait0Inst : parentTrait0_t t) (parentTrait0Inst1 :
   parentTrait0_t u) :
@@ -350,27 +350,27 @@ let order1
   Ok ()
 
 (** Trait declaration: [traits::ChildTrait1]
-    Source: 'tests/src/traits.rs', lines 222:0-222:35 *)
+    Source: 'tests/src/traits.rs', lines 223:0-223:35 *)
 noeq type childTrait1_t (self : Type0) = {
   parentTrait1Inst : parentTrait1_t self;
 }
 
 (** Trait implementation: [traits::{(traits::ParentTrait1 for usize)#9}]
-    Source: 'tests/src/traits.rs', lines 224:0-224:27 *)
+    Source: 'tests/src/traits.rs', lines 225:0-225:27 *)
 let parentTrait1Usize : parentTrait1_t usize = ()
 
 (** Trait implementation: [traits::{(traits::ChildTrait1 for usize)#10}]
-    Source: 'tests/src/traits.rs', lines 225:0-225:26 *)
+    Source: 'tests/src/traits.rs', lines 226:0-226:26 *)
 let childTrait1Usize : childTrait1_t usize = {
   parentTrait1Inst = parentTrait1Usize;
 }
 
 (** Trait declaration: [traits::Iterator]
-    Source: 'tests/src/traits.rs', lines 229:0-229:18 *)
+    Source: 'tests/src/traits.rs', lines 230:0-230:18 *)
 noeq type iterator_t (self : Type0) = { tItem : Type0; }
 
 (** Trait declaration: [traits::IntoIterator]
-    Source: 'tests/src/traits.rs', lines 233:0-233:22 *)
+    Source: 'tests/src/traits.rs', lines 234:0-234:22 *)
 noeq type intoIterator_t (self : Type0) = {
   tItem : Type0;
   tIntoIter : Type0;
@@ -379,107 +379,107 @@ noeq type intoIterator_t (self : Type0) = {
 }
 
 (** Trait declaration: [traits::FromResidual]
-    Source: 'tests/src/traits.rs', lines 250:0-250:21 *)
+    Source: 'tests/src/traits.rs', lines 251:0-251:21 *)
 type fromResidual_t (self t : Type0) = unit
 
 (** Trait declaration: [traits::Try]
-    Source: 'tests/src/traits.rs', lines 246:0-246:48 *)
+    Source: 'tests/src/traits.rs', lines 247:0-247:48 *)
 noeq type try_t (self : Type0) = {
   tResidual : Type0;
   fromResidualSelftraitsTryResidualInst : fromResidual_t self tResidual;
 }
 
 (** Trait declaration: [traits::WithTarget]
-    Source: 'tests/src/traits.rs', lines 252:0-252:20 *)
+    Source: 'tests/src/traits.rs', lines 253:0-253:20 *)
 noeq type withTarget_t (self : Type0) = { tTarget : Type0; }
 
 (** Trait declaration: [traits::ParentTrait2]
-    Source: 'tests/src/traits.rs', lines 256:0-256:22 *)
+    Source: 'tests/src/traits.rs', lines 257:0-257:22 *)
 noeq type parentTrait2_t (self : Type0) = {
   tU : Type0;
   tU_clause_0 : withTarget_t tU;
 }
 
 (** Trait declaration: [traits::ChildTrait2]
-    Source: 'tests/src/traits.rs', lines 260:0-260:35 *)
+    Source: 'tests/src/traits.rs', lines 261:0-261:35 *)
 noeq type childTrait2_t (self : Type0) = {
   parentTrait2Inst : parentTrait2_t self;
   convert : parentTrait2Inst.tU -> result parentTrait2Inst.tU_clause_0.tTarget;
 }
 
 (** Trait implementation: [traits::{(traits::WithTarget for u32)#11}]
-    Source: 'tests/src/traits.rs', lines 264:0-264:23 *)
+    Source: 'tests/src/traits.rs', lines 265:0-265:23 *)
 let withTargetU32 : withTarget_t u32 = { tTarget = u32; }
 
 (** Trait implementation: [traits::{(traits::ParentTrait2 for u32)#12}]
-    Source: 'tests/src/traits.rs', lines 268:0-268:25 *)
+    Source: 'tests/src/traits.rs', lines 269:0-269:25 *)
 let parentTrait2U32 : parentTrait2_t u32 = {
   tU = u32;
   tU_clause_0 = withTargetU32;
 }
 
 (** [traits::{(traits::ChildTrait2 for u32)#13}::convert]:
-    Source: 'tests/src/traits.rs', lines 273:4-273:29 *)
+    Source: 'tests/src/traits.rs', lines 274:4-274:29 *)
 let childTrait2U32_convert (x : u32) : result u32 =
   Ok x
 
 (** Trait implementation: [traits::{(traits::ChildTrait2 for u32)#13}]
-    Source: 'tests/src/traits.rs', lines 272:0-272:24 *)
+    Source: 'tests/src/traits.rs', lines 273:0-273:24 *)
 let childTrait2U32 : childTrait2_t u32 = {
   parentTrait2Inst = parentTrait2U32;
   convert = childTrait2U32_convert;
 }
 
 (** Trait declaration: [traits::CFnOnce]
-    Source: 'tests/src/traits.rs', lines 286:0-286:23 *)
+    Source: 'tests/src/traits.rs', lines 287:0-287:23 *)
 noeq type cFnOnce_t (self args : Type0) = {
   tOutput : Type0;
   call_once : self -> args -> result tOutput;
 }
 
 (** Trait declaration: [traits::CFnMut]
-    Source: 'tests/src/traits.rs', lines 292:0-292:37 *)
+    Source: 'tests/src/traits.rs', lines 293:0-293:37 *)
 noeq type cFnMut_t (self args : Type0) = {
   cFnOnceInst : cFnOnce_t self args;
   call_mut : self -> args -> result (cFnOnceInst.tOutput & self);
 }
 
 (** Trait declaration: [traits::CFn]
-    Source: 'tests/src/traits.rs', lines 296:0-296:33 *)
+    Source: 'tests/src/traits.rs', lines 297:0-297:33 *)
 noeq type cFn_t (self args : Type0) = {
   cFnMutInst : cFnMut_t self args;
   call : self -> args -> result cFnMutInst.cFnOnceInst.tOutput;
 }
 
 (** Trait declaration: [traits::GetTrait]
-    Source: 'tests/src/traits.rs', lines 300:0-300:18 *)
+    Source: 'tests/src/traits.rs', lines 301:0-301:18 *)
 noeq type getTrait_t (self : Type0) = { tW : Type0; get_w : self -> result tW;
 }
 
 (** [traits::test_get_trait]:
-    Source: 'tests/src/traits.rs', lines 305:0-305:49 *)
+    Source: 'tests/src/traits.rs', lines 306:0-306:49 *)
 let test_get_trait
   (t : Type0) (getTraitInst : getTrait_t t) (x : t) : result getTraitInst.tW =
   getTraitInst.get_w x
 
 (** Trait declaration: [traits::Trait]
-    Source: 'tests/src/traits.rs', lines 310:0-310:15 *)
+    Source: 'tests/src/traits.rs', lines 311:0-311:15 *)
 noeq type trait_t (self : Type0) = { cLEN : usize; }
 
 (** [traits::{(traits::Trait for @Array<T, N>)#14}::LEN]
-    Source: 'tests/src/traits.rs', lines 315:4-315:20 *)
+    Source: 'tests/src/traits.rs', lines 316:4-316:20 *)
 let trait_array_len_body (t : Type0) (n : usize) : result usize = Ok n
 let trait_array_len (t : Type0) (n : usize) : usize =
   eval_global (trait_array_len_body t n)
 
 (** Trait implementation: [traits::{(traits::Trait for @Array<T, N>)#14}]
-    Source: 'tests/src/traits.rs', lines 314:0-314:40 *)
+    Source: 'tests/src/traits.rs', lines 315:0-315:40 *)
 let traitArray (t : Type0) (n : usize) : trait_t (array t n) = {
   cLEN = trait_array_len t n;
 }
 
 (** [traits::{(traits::Trait for traits::Wrapper<T>)#15}::LEN]
-    Source: 'tests/src/traits.rs', lines 319:4-319:20 *)
+    Source: 'tests/src/traits.rs', lines 320:4-320:20 *)
 let traittraits_wrapper_len_body (t : Type0) (traitInst : trait_t t)
   : result usize =
   Ok 0
@@ -487,19 +487,19 @@ let traittraits_wrapper_len (t : Type0) (traitInst : trait_t t) : usize =
   eval_global (traittraits_wrapper_len_body t traitInst)
 
 (** Trait implementation: [traits::{(traits::Trait for traits::Wrapper<T>)#15}]
-    Source: 'tests/src/traits.rs', lines 318:0-318:35 *)
+    Source: 'tests/src/traits.rs', lines 319:0-319:35 *)
 let traittraitsWrapper (t : Type0) (traitInst : trait_t t) : trait_t (wrapper_t
   t) = {
   cLEN = traittraits_wrapper_len t traitInst;
 }
 
 (** [traits::use_wrapper_len]:
-    Source: 'tests/src/traits.rs', lines 322:0-322:43 *)
+    Source: 'tests/src/traits.rs', lines 323:0-323:43 *)
 let use_wrapper_len (t : Type0) (traitInst : trait_t t) : result usize =
   Ok (traittraitsWrapper t traitInst).cLEN
 
 (** [traits::Foo]
-    Source: 'tests/src/traits.rs', lines 326:0-326:20 *)
+    Source: 'tests/src/traits.rs', lines 327:0-327:20 *)
 type foo_t (t u : Type0) = { x : t; y : u; }
 
 (** [core::result::Result]
@@ -510,7 +510,7 @@ type core_result_Result_t (t e : Type0) =
 | Core_result_Result_Err : e -> core_result_Result_t t e
 
 (** [traits::{traits::Foo<T, U>#16}::FOO]
-    Source: 'tests/src/traits.rs', lines 332:4-332:33 *)
+    Source: 'tests/src/traits.rs', lines 333:4-333:33 *)
 let foo_foo_body (t u : Type0) (traitInst : trait_t t)
   : result (core_result_Result_t t i32) =
   Ok (Core_result_Result_Err 0)
@@ -519,13 +519,13 @@ let foo_foo (t u : Type0) (traitInst : trait_t t)
   eval_global (foo_foo_body t u traitInst)
 
 (** [traits::use_foo1]:
-    Source: 'tests/src/traits.rs', lines 335:0-335:48 *)
+    Source: 'tests/src/traits.rs', lines 336:0-336:48 *)
 let use_foo1
   (t u : Type0) (traitInst : trait_t t) : result (core_result_Result_t t i32) =
   Ok (foo_foo t u traitInst)
 
 (** [traits::use_foo2]:
-    Source: 'tests/src/traits.rs', lines 339:0-339:48 *)
+    Source: 'tests/src/traits.rs', lines 340:0-340:48 *)
 let use_foo2
   (t u : Type0) (traitInst : trait_t u) : result (core_result_Result_t u i32) =
   Ok (foo_foo u t traitInst)