Merge pull request #83 from AeneasVerif/son/backs

Remove the option to split the forward/backward functions

15 files changed, 0 insertions, 3023 deletions

diff --git a/tests/fstar-split/misc/Bitwise.fst b/tests/fstar-split/misc/Bitwise.fst
deleted file mode 100644
index d7ba2c57..00000000
--- a/tests/fstar-split/misc/Bitwise.fst
+++ /dev/null
@@ -1,32 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [bitwise] *)
-module Bitwise
-open Primitives
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [bitwise::shift_u32]: forward function
-    Source: 'src/bitwise.rs', lines 3:0-3:31 *)
-let shift_u32 (a : u32) : result u32 =
-  let* t = u32_shr #Usize a 16 in u32_shl #Usize t 16
-
-(** [bitwise::shift_i32]: forward function
-    Source: 'src/bitwise.rs', lines 10:0-10:31 *)
-let shift_i32 (a : i32) : result i32 =
-  let* t = i32_shr #Isize a 16 in i32_shl #Isize t 16
-
-(** [bitwise::xor_u32]: forward function
-    Source: 'src/bitwise.rs', lines 17:0-17:37 *)
-let xor_u32 (a : u32) (b : u32) : result u32 =
-  Return (u32_xor a b)
-
-(** [bitwise::or_u32]: forward function
-    Source: 'src/bitwise.rs', lines 21:0-21:36 *)
-let or_u32 (a : u32) (b : u32) : result u32 =
-  Return (u32_or a b)
-
-(** [bitwise::and_u32]: forward function
-    Source: 'src/bitwise.rs', lines 25:0-25:37 *)
-let and_u32 (a : u32) (b : u32) : result u32 =
-  Return (u32_and a b)
-
diff --git a/tests/fstar-split/misc/Constants.fst b/tests/fstar-split/misc/Constants.fst
deleted file mode 100644
index 7e56cc20..00000000
--- a/tests/fstar-split/misc/Constants.fst
+++ /dev/null
@@ -1,145 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [constants] *)
-module Constants
-open Primitives
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [constants::X0]
-    Source: 'src/constants.rs', lines 5:0-5:17 *)
-let x0_body : result u32 = Return 0
-let x0_c : u32 = eval_global x0_body
-
-(** [constants::X1]
-    Source: 'src/constants.rs', lines 7:0-7:17 *)
-let x1_body : result u32 = Return core_u32_max
-let x1_c : u32 = eval_global x1_body
-
-(** [constants::X2]
-    Source: 'src/constants.rs', lines 10:0-10:17 *)
-let x2_body : result u32 = Return 3
-let x2_c : u32 = eval_global x2_body
-
-(** [constants::incr]: forward function
-    Source: 'src/constants.rs', lines 17:0-17:32 *)
-let incr (n : u32) : result u32 =
-  u32_add n 1
-
-(** [constants::X3]
-    Source: 'src/constants.rs', lines 15:0-15:17 *)
-let x3_body : result u32 = incr 32
-let x3_c : u32 = eval_global x3_body
-
-(** [constants::mk_pair0]: forward function
-    Source: 'src/constants.rs', lines 23:0-23:51 *)
-let mk_pair0 (x : u32) (y : u32) : result (u32 & u32) =
-  Return (x, y)
-
-(** [constants::Pair]
-    Source: 'src/constants.rs', lines 36:0-36:23 *)
-type pair_t (t1 t2 : Type0) = { x : t1; y : t2; }
-
-(** [constants::mk_pair1]: forward function
-    Source: 'src/constants.rs', lines 27:0-27:55 *)
-let mk_pair1 (x : u32) (y : u32) : result (pair_t u32 u32) =
-  Return { x = x; y = y }
-
-(** [constants::P0]
-    Source: 'src/constants.rs', lines 31:0-31:24 *)
-let p0_body : result (u32 & u32) = mk_pair0 0 1
-let p0_c : (u32 & u32) = eval_global p0_body
-
-(** [constants::P1]
-    Source: 'src/constants.rs', lines 32:0-32:28 *)
-let p1_body : result (pair_t u32 u32) = mk_pair1 0 1
-let p1_c : pair_t u32 u32 = eval_global p1_body
-
-(** [constants::P2]
-    Source: 'src/constants.rs', lines 33:0-33:24 *)
-let p2_body : result (u32 & u32) = Return (0, 1)
-let p2_c : (u32 & u32) = eval_global p2_body
-
-(** [constants::P3]
-    Source: 'src/constants.rs', lines 34:0-34:28 *)
-let p3_body : result (pair_t u32 u32) = Return { x = 0; y = 1 }
-let p3_c : pair_t u32 u32 = eval_global p3_body
-
-(** [constants::Wrap]
-    Source: 'src/constants.rs', lines 49:0-49:18 *)
-type wrap_t (t : Type0) = { value : t; }
-
-(** [constants::{constants::Wrap<T>}::new]: forward function
-    Source: 'src/constants.rs', lines 54:4-54:41 *)
-let wrap_new (t : Type0) (value : t) : result (wrap_t t) =
-  Return { value = value }
-
-(** [constants::Y]
-    Source: 'src/constants.rs', lines 41:0-41:22 *)
-let y_body : result (wrap_t i32) = wrap_new i32 2
-let y_c : wrap_t i32 = eval_global y_body
-
-(** [constants::unwrap_y]: forward function
-    Source: 'src/constants.rs', lines 43:0-43:30 *)
-let unwrap_y : result i32 =
-  Return y_c.value
-
-(** [constants::YVAL]
-    Source: 'src/constants.rs', lines 47:0-47:19 *)
-let yval_body : result i32 = unwrap_y
-let yval_c : i32 = eval_global yval_body
-
-(** [constants::get_z1::Z1]
-    Source: 'src/constants.rs', lines 62:4-62:17 *)
-let get_z1_z1_body : result i32 = Return 3
-let get_z1_z1_c : i32 = eval_global get_z1_z1_body
-
-(** [constants::get_z1]: forward function
-    Source: 'src/constants.rs', lines 61:0-61:28 *)
-let get_z1 : result i32 =
-  Return get_z1_z1_c
-
-(** [constants::add]: forward function
-    Source: 'src/constants.rs', lines 66:0-66:39 *)
-let add (a : i32) (b : i32) : result i32 =
-  i32_add a b
-
-(** [constants::Q1]
-    Source: 'src/constants.rs', lines 74:0-74:17 *)
-let q1_body : result i32 = Return 5
-let q1_c : i32 = eval_global q1_body
-
-(** [constants::Q2]
-    Source: 'src/constants.rs', lines 75:0-75:17 *)
-let q2_body : result i32 = Return q1_c
-let q2_c : i32 = eval_global q2_body
-
-(** [constants::Q3]
-    Source: 'src/constants.rs', lines 76:0-76:17 *)
-let q3_body : result i32 = add q2_c 3
-let q3_c : i32 = eval_global q3_body
-
-(** [constants::get_z2]: forward function
-    Source: 'src/constants.rs', lines 70:0-70:28 *)
-let get_z2 : result i32 =
-  let* i = get_z1 in let* i1 = add i q3_c in add q1_c i1
-
-(** [constants::S1]
-    Source: 'src/constants.rs', lines 80:0-80:18 *)
-let s1_body : result u32 = Return 6
-let s1_c : u32 = eval_global s1_body
-
-(** [constants::S2]
-    Source: 'src/constants.rs', lines 81:0-81:18 *)
-let s2_body : result u32 = incr s1_c
-let s2_c : u32 = eval_global s2_body
-
-(** [constants::S3]
-    Source: 'src/constants.rs', lines 82:0-82:29 *)
-let s3_body : result (pair_t u32 u32) = Return p3_c
-let s3_c : pair_t u32 u32 = eval_global s3_body
-
-(** [constants::S4]
-    Source: 'src/constants.rs', lines 83:0-83:29 *)
-let s4_body : result (pair_t u32 u32) = mk_pair1 7 8
-let s4_c : pair_t u32 u32 = eval_global s4_body
-
diff --git a/tests/fstar-split/misc/External.Funs.fst b/tests/fstar-split/misc/External.Funs.fst
deleted file mode 100644
index 65382549..00000000
--- a/tests/fstar-split/misc/External.Funs.fst
+++ /dev/null
@@ -1,82 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [external]: function definitions *)
-module External.Funs
-open Primitives
-include External.Types
-include External.FunsExternal
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [external::swap]: forward function
-    Source: 'src/external.rs', lines 6:0-6:46 *)
-let swap (t : Type0) (x : t) (y : t) (st : state) : result (state & unit) =
-  let* (st1, _) = core_mem_swap t x y st in
-  let* (st2, _) = core_mem_swap_back0 t x y st st1 in
-  let* (st3, _) = core_mem_swap_back1 t x y st st2 in
-  Return (st3, ())
-
-(** [external::swap]: backward function 0
-    Source: 'src/external.rs', lines 6:0-6:46 *)
-let swap_back
-  (t : Type0) (x : t) (y : t) (st : state) (st1 : state) :
-  result (state & (t & t))
-  =
-  let* (st2, _) = core_mem_swap t x y st in
-  let* (st3, x1) = core_mem_swap_back0 t x y st st2 in
-  let* (_, y1) = core_mem_swap_back1 t x y st st3 in
-  Return (st1, (x1, y1))
-
-(** [external::test_new_non_zero_u32]: forward function
-    Source: 'src/external.rs', lines 11:0-11:60 *)
-let test_new_non_zero_u32
-  (x : u32) (st : state) : result (state & core_num_nonzero_NonZeroU32_t) =
-  let* (st1, o) = core_num_nonzero_NonZeroU32_new x st in
-  core_option_Option_unwrap core_num_nonzero_NonZeroU32_t o st1
-
-(** [external::test_vec]: forward function
-    Source: 'src/external.rs', lines 17:0-17:17 *)
-let test_vec : result unit =
-  let* _ = alloc_vec_Vec_push u32 (alloc_vec_Vec_new u32) 0 in Return ()
-
-(** Unit test for [external::test_vec] *)
-let _ = assert_norm (test_vec = Return ())
-
-(** [external::custom_swap]: forward function
-    Source: 'src/external.rs', lines 24:0-24:66 *)
-let custom_swap (t : Type0) (x : t) (y : t) (st : state) : result (state & t) =
-  let* (st1, _) = core_mem_swap t x y st in
-  let* (st2, x1) = core_mem_swap_back0 t x y st st1 in
-  let* (st3, _) = core_mem_swap_back1 t x y st st2 in
-  Return (st3, x1)
-
-(** [external::custom_swap]: backward function 0
-    Source: 'src/external.rs', lines 24:0-24:66 *)
-let custom_swap_back
-  (t : Type0) (x : t) (y : t) (st : state) (ret : t) (st1 : state) :
-  result (state & (t & t))
-  =
-  let* (st2, _) = core_mem_swap t x y st in
-  let* (st3, _) = core_mem_swap_back0 t x y st st2 in
-  let* (_, y1) = core_mem_swap_back1 t x y st st3 in
-  Return (st1, (ret, y1))
-
-(** [external::test_custom_swap]: forward function
-    Source: 'src/external.rs', lines 29:0-29:59 *)
-let test_custom_swap (x : u32) (y : u32) (st : state) : result (state & unit) =
-  let* (st1, _) = custom_swap u32 x y st in Return (st1, ())
-
-(** [external::test_custom_swap]: backward function 0
-    Source: 'src/external.rs', lines 29:0-29:59 *)
-let test_custom_swap_back
-  (x : u32) (y : u32) (st : state) (st1 : state) :
-  result (state & (u32 & u32))
-  =
-  custom_swap_back u32 x y st 1 st1
-
-(** [external::test_swap_non_zero]: forward function
-    Source: 'src/external.rs', lines 35:0-35:44 *)
-let test_swap_non_zero (x : u32) (st : state) : result (state & u32) =
-  let* (st1, _) = swap u32 x 0 st in
-  let* (st2, (x1, _)) = swap_back u32 x 0 st st1 in
-  if x1 = 0 then Fail Failure else Return (st2, x1)
-
diff --git a/tests/fstar-split/misc/External.FunsExternal.fsti b/tests/fstar-split/misc/External.FunsExternal.fsti
deleted file mode 100644
index 923a1101..00000000
--- a/tests/fstar-split/misc/External.FunsExternal.fsti
+++ /dev/null
@@ -1,32 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [external]: external function declarations *)
-module External.FunsExternal
-open Primitives
-include External.Types
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [core::mem::swap]: forward function
-    Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/mem/mod.rs', lines 726:0-726:42 *)
-val core_mem_swap (t : Type0) : t -> t -> state -> result (state & unit)
-
-(** [core::mem::swap]: backward function 0
-    Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/mem/mod.rs', lines 726:0-726:42 *)
-val core_mem_swap_back0
-  (t : Type0) : t -> t -> state -> state -> result (state & t)
-
-(** [core::mem::swap]: backward function 1
-    Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/mem/mod.rs', lines 726:0-726:42 *)
-val core_mem_swap_back1
-  (t : Type0) : t -> t -> state -> state -> result (state & t)
-
-(** [core::num::nonzero::{core::num::nonzero::NonZeroU32#14}::new]: forward function
-    Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/num/nonzero.rs', lines 79:16-79:57 *)
-val core_num_nonzero_NonZeroU32_new
-  : u32 -> state -> result (state & (option core_num_nonzero_NonZeroU32_t))
-
-(** [core::option::{core::option::Option<T>}::unwrap]: forward function
-    Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/option.rs', lines 932:4-932:34 *)
-val core_option_Option_unwrap
-  (t : Type0) : option t -> state -> result (state & t)
-
diff --git a/tests/fstar-split/misc/External.Types.fst b/tests/fstar-split/misc/External.Types.fst
deleted file mode 100644
index 4fbcec47..00000000
--- a/tests/fstar-split/misc/External.Types.fst
+++ /dev/null
@@ -1,8 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [external]: type definitions *)
-module External.Types
-open Primitives
-include External.TypesExternal
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
diff --git a/tests/fstar-split/misc/External.TypesExternal.fsti b/tests/fstar-split/misc/External.TypesExternal.fsti
deleted file mode 100644
index 4bfbe0c5..00000000
--- a/tests/fstar-split/misc/External.TypesExternal.fsti
+++ /dev/null
@@ -1,14 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [external]: external type declarations *)
-module External.TypesExternal
-open Primitives
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [core::num::nonzero::NonZeroU32]
-    Source: '/rustc/d59363ad0b6391b7fc5bbb02c9ccf9300eef3753/library/core/src/num/nonzero.rs', lines 50:12-50:33 *)
-val core_num_nonzero_NonZeroU32_t : Type0
-
-(** The state type used in the state-error monad *)
-val state : Type0
-
diff --git a/tests/fstar-split/misc/Loops.Clauses.Template.fst b/tests/fstar-split/misc/Loops.Clauses.Template.fst
deleted file mode 100644
index 244761d3..00000000
--- a/tests/fstar-split/misc/Loops.Clauses.Template.fst
+++ /dev/null
@@ -1,138 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [loops]: templates for the decreases clauses *)
-module Loops.Clauses.Template
-open Primitives
-open Loops.Types
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [loops::sum]: decreases clause
-    Source: 'src/loops.rs', lines 4:0-14:1 *)
-unfold let sum_loop_decreases (max : u32) (i : u32) (s : u32) : nat = admit ()
-
-(** [loops::sum_with_mut_borrows]: decreases clause
-    Source: 'src/loops.rs', lines 19:0-31:1 *)
-unfold
-let sum_with_mut_borrows_loop_decreases (max : u32) (mi : u32) (ms : u32) : nat
-  =
-  admit ()
-
-(** [loops::sum_with_shared_borrows]: decreases clause
-    Source: 'src/loops.rs', lines 34:0-48:1 *)
-unfold
-let sum_with_shared_borrows_loop_decreases (max : u32) (i : u32) (s : u32) :
-  nat =
-  admit ()
-
-(** [loops::sum_array]: decreases clause
-    Source: 'src/loops.rs', lines 50:0-58:1 *)
-unfold
-let sum_array_loop_decreases (n : usize) (a : array u32 n) (i : usize)
-  (s : u32) : nat =
-  admit ()
-
-(** [loops::clear]: decreases clause
-    Source: 'src/loops.rs', lines 62:0-68:1 *)
-unfold
-let clear_loop_decreases (v : alloc_vec_Vec u32) (i : usize) : nat = admit ()
-
-(** [loops::list_mem]: decreases clause
-    Source: 'src/loops.rs', lines 76:0-85:1 *)
-unfold let list_mem_loop_decreases (x : u32) (ls : list_t u32) : nat = admit ()
-
-(** [loops::list_nth_mut_loop]: decreases clause
-    Source: 'src/loops.rs', lines 88:0-98: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: 'src/loops.rs', lines 101:0-111: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: 'src/loops.rs', lines 113:0-127:1 *)
-unfold
-let get_elem_mut_loop_decreases (x : usize) (ls : list_t usize) : nat =
-  admit ()
-
-(** [loops::get_elem_shared]: decreases clause
-    Source: 'src/loops.rs', lines 129:0-143: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: 'src/loops.rs', lines 154:0-165: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: 'src/loops.rs', lines 168:0-179: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: 'src/loops.rs', lines 184:0-205: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: 'src/loops.rs', lines 208:0-229: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: 'src/loops.rs', lines 233:0-248: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: 'src/loops.rs', lines 251:0-266: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: 'src/loops.rs', lines 269:0-284: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: 'src/loops.rs', lines 288:0-303: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: 'src/loops.rs', lines 307:0-322: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: 'src/loops.rs', lines 326:0-341: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 ()
-
diff --git a/tests/fstar-split/misc/Loops.Clauses.fst b/tests/fstar-split/misc/Loops.Clauses.fst
deleted file mode 100644
index 13f5513d..00000000
--- a/tests/fstar-split/misc/Loops.Clauses.fst
+++ /dev/null
@@ -1,112 +0,0 @@
-(** [loops]: templates for the decreases clauses *)
-module Loops.Clauses
-open Primitives
-open Loops.Types
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [loops::sum]: decreases clause *)
-unfold let sum_loop_decreases (max : u32) (i : u32) (s : u32) : nat =
-  if i <= max then max - i else 0
-
-(** [loops::sum_with_mut_borrows]: decreases clause *)
-unfold
-let sum_with_mut_borrows_loop_decreases (max : u32) (mi : u32) (ms : u32) : nat =
-  if max >= mi then max - mi else 0
-
-(** [loops::sum_with_shared_borrows]: decreases clause *)
-unfold
-let sum_with_shared_borrows_loop_decreases (max : u32) (i : u32) (s : u32) : nat =
-  if max >= i then max - i else 0
-
-(** [loops::sum_array]: decreases clause *)
-unfold
-let sum_array_loop_decreases (n : usize) (_ : array u32 n) (i : usize) (_ : u32) : nat =
-  if n >= i then n - i else 0
-
-(** [loops::clear]: decreases clause *)
-unfold let clear_loop_decreases (v : alloc_vec_Vec u32) (i : usize) : nat =
-  if i <= List.Tot.length v then List.Tot.length v - i else 0
-
-(** [loops::list_mem]: decreases clause *)
-unfold let list_mem_loop_decreases (i : u32) (ls : list_t u32) : list_t u32 =
-  ls
-
-(** [loops::list_nth_mut_loop]: decreases clause *)
-unfold
-let list_nth_mut_loop_loop_decreases (t : Type0) (ls : list_t t) (i : u32) : nat =
-  i
-
-(** [loops::list_nth_shared_loop]: decreases clause *)
-unfold
-let list_nth_shared_loop_loop_decreases (t : Type0) (ls : list_t t) (i : u32) : list_t t =
-  ls
-
-(** [loops::get_elem_mut]: decreases clause *)
-unfold
-let get_elem_mut_loop_decreases (x : usize) (ls : list_t usize) : list_t usize = ls
-
-(** [loops::get_elem_shared]: decreases clause *)
-unfold
-let get_elem_shared_loop_decreases (x : usize) (ls : list_t usize) : list_t usize =
-  ls
-
-(** [loops::list_nth_mut_loop_with_id]: decreases clause *)
-unfold
-let list_nth_mut_loop_with_id_loop_decreases (t : Type0) (i : u32) (ls : list_t t) :
-  list_t t =
-  ls
-
-(** [loops::list_nth_shared_loop_with_id]: decreases clause *)
-unfold
-let list_nth_shared_loop_with_id_loop_decreases (t : Type0) (i : u32)
-  (ls : list_t t) : list_t t =
-  ls
-
-(** [loops::list_nth_mut_loop_pair]: decreases clause *)
-unfold
-let list_nth_mut_loop_pair_loop_decreases (t : Type0) (l : list_t t) (l0 : list_t t)
-  (i : u32) : nat =
-  i
-
-(** [loops::list_nth_shared_loop_pair]: decreases clause *)
-unfold
-let list_nth_shared_loop_pair_loop_decreases (t : Type0) (l : list_t t)
-  (l0 : list_t t) (i : u32) : list_t t =
-  l
-
-(** [loops::list_nth_mut_loop_pair_merge]: decreases clause *)
-unfold
-let list_nth_mut_loop_pair_merge_loop_decreases (t : Type0) (l : list_t t)
-  (l0 : list_t t) (i : u32) : nat =
-  i
-
-(** [loops::list_nth_shared_loop_pair_merge]: decreases clause *)
-unfold
-let list_nth_shared_loop_pair_merge_loop_decreases (t : Type0) (l : list_t t)
-  (l0 : list_t t) (i : u32) : list_t t =
-  l
-
-(** [loops::list_nth_mut_shared_loop_pair]: decreases clause *)
-unfold
-let list_nth_mut_shared_loop_pair_loop_decreases (t : Type0) (l : list_t t)
-  (l0 : list_t t) (i : u32) : list_t t =
-  l
-
-(** [loops::list_nth_mut_shared_loop_pair_merge]: decreases clause *)
-unfold
-let list_nth_mut_shared_loop_pair_merge_loop_decreases (t : Type0) (l : list_t t)
-  (l0 : list_t t) (i : u32) : list_t t =
-  l
-
-(** [loops::list_nth_shared_mut_loop_pair]: decreases clause *)
-unfold
-let list_nth_shared_mut_loop_pair_loop_decreases (t : Type0) (l : list_t t)
-  (l0 : list_t t) (i : u32) : list_t t =
-  l
-
-(** [loops::list_nth_shared_mut_loop_pair_merge]: decreases clause *)
-unfold
-let list_nth_shared_mut_loop_pair_merge_loop_decreases (t : Type0) (l : list_t t)
-  (l0 : list_t t) (i : u32) : list_t t =
-  l
diff --git a/tests/fstar-split/misc/Loops.Funs.fst b/tests/fstar-split/misc/Loops.Funs.fst
deleted file mode 100644
index 01d66726..00000000
--- a/tests/fstar-split/misc/Loops.Funs.fst
+++ /dev/null
@@ -1,753 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [loops]: function definitions *)
-module Loops.Funs
-open Primitives
-include Loops.Types
-include Loops.Clauses
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [loops::sum]: loop 0: forward function
-    Source: 'src/loops.rs', lines 4:0-14:1 *)
-let rec sum_loop
-  (max : u32) (i : u32) (s : u32) :
-  Tot (result u32) (decreases (sum_loop_decreases max i s))
-  =
-  if i < max
-  then let* s1 = u32_add s i in let* i1 = u32_add i 1 in sum_loop max i1 s1
-  else u32_mul s 2
-
-(** [loops::sum]: forward function
-    Source: 'src/loops.rs', lines 4:0-4:27 *)
-let sum (max : u32) : result u32 =
-  sum_loop max 0 0
-
-(** [loops::sum_with_mut_borrows]: loop 0: forward function
-    Source: 'src/loops.rs', lines 19:0-31:1 *)
-let rec sum_with_mut_borrows_loop
-  (max : u32) (mi : u32) (ms : u32) :
-  Tot (result u32) (decreases (sum_with_mut_borrows_loop_decreases max mi ms))
-  =
-  if mi < max
-  then
-    let* ms1 = u32_add ms mi in
-    let* mi1 = u32_add mi 1 in
-    sum_with_mut_borrows_loop max mi1 ms1
-  else u32_mul ms 2
-
-(** [loops::sum_with_mut_borrows]: forward function
-    Source: 'src/loops.rs', lines 19:0-19: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: forward function
-    Source: 'src/loops.rs', lines 34:0-48: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))
-  =
-  if i < max
-  then
-    let* i1 = u32_add i 1 in
-    let* s1 = u32_add s i1 in
-    sum_with_shared_borrows_loop max i1 s1
-  else u32_mul s 2
-
-(** [loops::sum_with_shared_borrows]: forward function
-    Source: 'src/loops.rs', lines 34:0-34:47 *)
-let sum_with_shared_borrows (max : u32) : result u32 =
-  sum_with_shared_borrows_loop max 0 0
-
-(** [loops::sum_array]: loop 0: forward function
-    Source: 'src/loops.rs', lines 50:0-58: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))
-  =
-  if i < n
-  then
-    let* i1 = array_index_usize u32 n a i in
-    let* s1 = u32_add s i1 in
-    let* i2 = usize_add i 1 in
-    sum_array_loop n a i2 s1
-  else Return s
-
-(** [loops::sum_array]: forward function
-    Source: 'src/loops.rs', lines 50:0-50:52 *)
-let sum_array (n : usize) (a : array u32 n) : result u32 =
-  sum_array_loop n a 0 0
-
-(** [loops::clear]: loop 0: merged forward/backward function
-    (there is a single backward function, and the forward function returns ())
-    Source: 'src/loops.rs', lines 62:0-68:1 *)
-let rec clear_loop
-  (v : alloc_vec_Vec u32) (i : usize) :
-  Tot (result (alloc_vec_Vec u32)) (decreases (clear_loop_decreases v i))
-  =
-  let i1 = alloc_vec_Vec_len u32 v in
-  if i < i1
-  then
-    let* i2 = usize_add i 1 in
-    let* v1 =
-      alloc_vec_Vec_index_mut_back u32 usize
-        (core_slice_index_SliceIndexUsizeSliceTInst u32) v i 0 in
-    clear_loop v1 i2
-  else Return v
-
-(** [loops::clear]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ())
-    Source: 'src/loops.rs', lines 62:0-62:30 *)
-let clear (v : alloc_vec_Vec u32) : result (alloc_vec_Vec u32) =
-  clear_loop v 0
-
-(** [loops::list_mem]: loop 0: forward function
-    Source: 'src/loops.rs', lines 76:0-85:1 *)
-let rec list_mem_loop
-  (x : u32) (ls : list_t u32) :
-  Tot (result bool) (decreases (list_mem_loop_decreases x ls))
-  =
-  begin match ls with
-  | List_Cons y tl -> if y = x then Return true else list_mem_loop x tl
-  | List_Nil -> Return false
-  end
-
-(** [loops::list_mem]: forward function
-    Source: 'src/loops.rs', lines 76:0-76:52 *)
-let list_mem (x : u32) (ls : list_t u32) : result bool =
-  list_mem_loop x ls
-
-(** [loops::list_nth_mut_loop]: loop 0: forward function
-    Source: 'src/loops.rs', lines 88:0-98:1 *)
-let rec list_nth_mut_loop_loop
-  (t : Type0) (ls : list_t t) (i : u32) :
-  Tot (result t) (decreases (list_nth_mut_loop_loop_decreases t ls i))
-  =
-  begin match ls with
-  | List_Cons x tl ->
-    if i = 0
-    then Return x
-    else let* i1 = u32_sub i 1 in list_nth_mut_loop_loop t tl i1
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_loop]: forward function
-    Source: 'src/loops.rs', lines 88:0-88:71 *)
-let list_nth_mut_loop (t : Type0) (ls : list_t t) (i : u32) : result t =
-  list_nth_mut_loop_loop t ls i
-
-(** [loops::list_nth_mut_loop]: loop 0: backward function 0
-    Source: 'src/loops.rs', lines 88:0-98:1 *)
-let rec list_nth_mut_loop_loop_back
-  (t : Type0) (ls : list_t t) (i : u32) (ret : t) :
-  Tot (result (list_t t)) (decreases (list_nth_mut_loop_loop_decreases t ls i))
-  =
-  begin match ls with
-  | List_Cons x tl ->
-    if i = 0
-    then Return (List_Cons ret tl)
-    else
-      let* i1 = u32_sub i 1 in
-      let* tl1 = list_nth_mut_loop_loop_back t tl i1 ret in
-      Return (List_Cons x tl1)
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_loop]: backward function 0
-    Source: 'src/loops.rs', lines 88:0-88:71 *)
-let list_nth_mut_loop_back
-  (t : Type0) (ls : list_t t) (i : u32) (ret : t) : result (list_t t) =
-  list_nth_mut_loop_loop_back t ls i ret
-
-(** [loops::list_nth_shared_loop]: loop 0: forward function
-    Source: 'src/loops.rs', lines 101:0-111: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))
-  =
-  begin match ls with
-  | List_Cons x tl ->
-    if i = 0
-    then Return x
-    else let* i1 = u32_sub i 1 in list_nth_shared_loop_loop t tl i1
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_shared_loop]: forward function
-    Source: 'src/loops.rs', lines 101:0-101: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: forward function
-    Source: 'src/loops.rs', lines 113:0-127:1 *)
-let rec get_elem_mut_loop
-  (x : usize) (ls : list_t usize) :
-  Tot (result usize) (decreases (get_elem_mut_loop_decreases x ls))
-  =
-  begin match ls with
-  | List_Cons y tl -> if y = x then Return y else get_elem_mut_loop x tl
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::get_elem_mut]: forward function
-    Source: 'src/loops.rs', lines 113:0-113:73 *)
-let get_elem_mut
-  (slots : alloc_vec_Vec (list_t usize)) (x : usize) : result usize =
-  let* l =
-    alloc_vec_Vec_index_mut (list_t usize) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (list_t usize)) slots 0 in
-  get_elem_mut_loop x l
-
-(** [loops::get_elem_mut]: loop 0: backward function 0
-    Source: 'src/loops.rs', lines 113:0-127:1 *)
-let rec get_elem_mut_loop_back
-  (x : usize) (ls : list_t usize) (ret : usize) :
-  Tot (result (list_t usize)) (decreases (get_elem_mut_loop_decreases x ls))
-  =
-  begin match ls with
-  | List_Cons y tl ->
-    if y = x
-    then Return (List_Cons ret tl)
-    else let* tl1 = get_elem_mut_loop_back x tl ret in Return (List_Cons y tl1)
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::get_elem_mut]: backward function 0
-    Source: 'src/loops.rs', lines 113:0-113:73 *)
-let get_elem_mut_back
-  (slots : alloc_vec_Vec (list_t usize)) (x : usize) (ret : usize) :
-  result (alloc_vec_Vec (list_t usize))
-  =
-  let* l =
-    alloc_vec_Vec_index_mut (list_t usize) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (list_t usize)) slots 0 in
-  let* l1 = get_elem_mut_loop_back x l ret in
-  alloc_vec_Vec_index_mut_back (list_t usize) usize
-    (core_slice_index_SliceIndexUsizeSliceTInst (list_t usize)) slots 0 l1
-
-(** [loops::get_elem_shared]: loop 0: forward function
-    Source: 'src/loops.rs', lines 129:0-143:1 *)
-let rec get_elem_shared_loop
-  (x : usize) (ls : list_t usize) :
-  Tot (result usize) (decreases (get_elem_shared_loop_decreases x ls))
-  =
-  begin match ls with
-  | List_Cons y tl -> if y = x then Return y else get_elem_shared_loop x tl
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::get_elem_shared]: forward function
-    Source: 'src/loops.rs', lines 129:0-129:68 *)
-let get_elem_shared
-  (slots : alloc_vec_Vec (list_t usize)) (x : usize) : result usize =
-  let* l =
-    alloc_vec_Vec_index (list_t usize) usize
-      (core_slice_index_SliceIndexUsizeSliceTInst (list_t usize)) slots 0 in
-  get_elem_shared_loop x l
-
-(** [loops::id_mut]: forward function
-    Source: 'src/loops.rs', lines 145:0-145:50 *)
-let id_mut (t : Type0) (ls : list_t t) : result (list_t t) =
-  Return ls
-
-(** [loops::id_mut]: backward function 0
-    Source: 'src/loops.rs', lines 145:0-145:50 *)
-let id_mut_back
-  (t : Type0) (ls : list_t t) (ret : list_t t) : result (list_t t) =
-  Return ret
-
-(** [loops::id_shared]: forward function
-    Source: 'src/loops.rs', lines 149:0-149:45 *)
-let id_shared (t : Type0) (ls : list_t t) : result (list_t t) =
-  Return ls
-
-(** [loops::list_nth_mut_loop_with_id]: loop 0: forward function
-    Source: 'src/loops.rs', lines 154:0-165:1 *)
-let rec list_nth_mut_loop_with_id_loop
-  (t : Type0) (i : u32) (ls : list_t t) :
-  Tot (result t) (decreases (list_nth_mut_loop_with_id_loop_decreases t i ls))
-  =
-  begin match ls with
-  | List_Cons x tl ->
-    if i = 0
-    then Return x
-    else let* i1 = u32_sub i 1 in list_nth_mut_loop_with_id_loop t i1 tl
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_loop_with_id]: forward function
-    Source: 'src/loops.rs', lines 154:0-154:75 *)
-let list_nth_mut_loop_with_id
-  (t : Type0) (ls : list_t t) (i : u32) : result t =
-  let* ls1 = id_mut t ls in list_nth_mut_loop_with_id_loop t i ls1
-
-(** [loops::list_nth_mut_loop_with_id]: loop 0: backward function 0
-    Source: 'src/loops.rs', lines 154:0-165:1 *)
-let rec list_nth_mut_loop_with_id_loop_back
-  (t : Type0) (i : u32) (ls : list_t t) (ret : t) :
-  Tot (result (list_t t))
-  (decreases (list_nth_mut_loop_with_id_loop_decreases t i ls))
-  =
-  begin match ls with
-  | List_Cons x tl ->
-    if i = 0
-    then Return (List_Cons ret tl)
-    else
-      let* i1 = u32_sub i 1 in
-      let* tl1 = list_nth_mut_loop_with_id_loop_back t i1 tl ret in
-      Return (List_Cons x tl1)
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_loop_with_id]: backward function 0
-    Source: 'src/loops.rs', lines 154:0-154:75 *)
-let list_nth_mut_loop_with_id_back
-  (t : Type0) (ls : list_t t) (i : u32) (ret : t) : result (list_t t) =
-  let* ls1 = id_mut t ls in
-  let* l = list_nth_mut_loop_with_id_loop_back t i ls1 ret in
-  id_mut_back t ls l
-
-(** [loops::list_nth_shared_loop_with_id]: loop 0: forward function
-    Source: 'src/loops.rs', lines 168:0-179:1 *)
-let rec list_nth_shared_loop_with_id_loop
-  (t : Type0) (i : u32) (ls : list_t t) :
-  Tot (result t)
-  (decreases (list_nth_shared_loop_with_id_loop_decreases t i ls))
-  =
-  begin match ls with
-  | List_Cons x tl ->
-    if i = 0
-    then Return x
-    else let* i1 = u32_sub i 1 in list_nth_shared_loop_with_id_loop t i1 tl
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_shared_loop_with_id]: forward function
-    Source: 'src/loops.rs', lines 168:0-168: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: forward function
-    Source: 'src/loops.rs', lines 184:0-205: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))
-  (decreases (list_nth_mut_loop_pair_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (x0, x1)
-      else let* i1 = u32_sub i 1 in list_nth_mut_loop_pair_loop t tl0 tl1 i1
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_loop_pair]: forward function
-    Source: 'src/loops.rs', lines 184:0-188:27 *)
-let list_nth_mut_loop_pair
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) : result (t & t) =
-  list_nth_mut_loop_pair_loop t ls0 ls1 i
-
-(** [loops::list_nth_mut_loop_pair]: loop 0: backward function 0
-    Source: 'src/loops.rs', lines 184:0-205:1 *)
-let rec list_nth_mut_loop_pair_loop_back'a
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  Tot (result (list_t t))
-  (decreases (list_nth_mut_loop_pair_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons _ tl1 ->
-      if i = 0
-      then Return (List_Cons ret tl0)
-      else
-        let* i1 = u32_sub i 1 in
-        let* tl01 = list_nth_mut_loop_pair_loop_back'a t tl0 tl1 i1 ret in
-        Return (List_Cons x0 tl01)
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_loop_pair]: backward function 0
-    Source: 'src/loops.rs', lines 184:0-188:27 *)
-let list_nth_mut_loop_pair_back'a
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  result (list_t t)
-  =
-  list_nth_mut_loop_pair_loop_back'a t ls0 ls1 i ret
-
-(** [loops::list_nth_mut_loop_pair]: loop 0: backward function 1
-    Source: 'src/loops.rs', lines 184:0-205:1 *)
-let rec list_nth_mut_loop_pair_loop_back'b
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  Tot (result (list_t t))
-  (decreases (list_nth_mut_loop_pair_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons _ tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (List_Cons ret tl1)
-      else
-        let* i1 = u32_sub i 1 in
-        let* tl11 = list_nth_mut_loop_pair_loop_back'b t tl0 tl1 i1 ret in
-        Return (List_Cons x1 tl11)
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_loop_pair]: backward function 1
-    Source: 'src/loops.rs', lines 184:0-188:27 *)
-let list_nth_mut_loop_pair_back'b
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  result (list_t t)
-  =
-  list_nth_mut_loop_pair_loop_back'b t ls0 ls1 i ret
-
-(** [loops::list_nth_shared_loop_pair]: loop 0: forward function
-    Source: 'src/loops.rs', lines 208:0-229: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))
-  (decreases (list_nth_shared_loop_pair_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (x0, x1)
-      else let* i1 = u32_sub i 1 in list_nth_shared_loop_pair_loop t tl0 tl1 i1
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_shared_loop_pair]: forward function
-    Source: 'src/loops.rs', lines 208:0-212: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: forward function
-    Source: 'src/loops.rs', lines 233:0-248: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))
-  (decreases (list_nth_mut_loop_pair_merge_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (x0, x1)
-      else
-        let* i1 = u32_sub i 1 in list_nth_mut_loop_pair_merge_loop t tl0 tl1 i1
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_loop_pair_merge]: forward function
-    Source: 'src/loops.rs', lines 233:0-237:27 *)
-let list_nth_mut_loop_pair_merge
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) : result (t & t) =
-  list_nth_mut_loop_pair_merge_loop t ls0 ls1 i
-
-(** [loops::list_nth_mut_loop_pair_merge]: loop 0: backward function 0
-    Source: 'src/loops.rs', lines 233:0-248:1 *)
-let rec list_nth_mut_loop_pair_merge_loop_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : (t & t)) :
-  Tot (result ((list_t t) & (list_t t)))
-  (decreases (list_nth_mut_loop_pair_merge_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then let (x, x2) = ret in Return (List_Cons x tl0, List_Cons x2 tl1)
-      else
-        let* i1 = u32_sub i 1 in
-        let* (tl01, tl11) =
-          list_nth_mut_loop_pair_merge_loop_back t tl0 tl1 i1 ret in
-        Return (List_Cons x0 tl01, List_Cons x1 tl11)
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_loop_pair_merge]: backward function 0
-    Source: 'src/loops.rs', lines 233:0-237:27 *)
-let list_nth_mut_loop_pair_merge_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : (t & t)) :
-  result ((list_t t) & (list_t t))
-  =
-  list_nth_mut_loop_pair_merge_loop_back t ls0 ls1 i ret
-
-(** [loops::list_nth_shared_loop_pair_merge]: loop 0: forward function
-    Source: 'src/loops.rs', lines 251:0-266: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))
-  (decreases (list_nth_shared_loop_pair_merge_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (x0, x1)
-      else
-        let* i1 = u32_sub i 1 in
-        list_nth_shared_loop_pair_merge_loop t tl0 tl1 i1
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_shared_loop_pair_merge]: forward function
-    Source: 'src/loops.rs', lines 251:0-255: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: forward function
-    Source: 'src/loops.rs', lines 269:0-284: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))
-  (decreases (list_nth_mut_shared_loop_pair_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (x0, x1)
-      else
-        let* i1 = u32_sub i 1 in
-        list_nth_mut_shared_loop_pair_loop t tl0 tl1 i1
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_shared_loop_pair]: forward function
-    Source: 'src/loops.rs', lines 269:0-273:23 *)
-let list_nth_mut_shared_loop_pair
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) : result (t & t) =
-  list_nth_mut_shared_loop_pair_loop t ls0 ls1 i
-
-(** [loops::list_nth_mut_shared_loop_pair]: loop 0: backward function 0
-    Source: 'src/loops.rs', lines 269:0-284:1 *)
-let rec list_nth_mut_shared_loop_pair_loop_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  Tot (result (list_t t))
-  (decreases (list_nth_mut_shared_loop_pair_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons _ tl1 ->
-      if i = 0
-      then Return (List_Cons ret tl0)
-      else
-        let* i1 = u32_sub i 1 in
-        let* tl01 = list_nth_mut_shared_loop_pair_loop_back t tl0 tl1 i1 ret in
-        Return (List_Cons x0 tl01)
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_shared_loop_pair]: backward function 0
-    Source: 'src/loops.rs', lines 269:0-273:23 *)
-let list_nth_mut_shared_loop_pair_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  result (list_t t)
-  =
-  list_nth_mut_shared_loop_pair_loop_back t ls0 ls1 i ret
-
-(** [loops::list_nth_mut_shared_loop_pair_merge]: loop 0: forward function
-    Source: 'src/loops.rs', lines 288:0-303: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))
-  (decreases (list_nth_mut_shared_loop_pair_merge_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (x0, x1)
-      else
-        let* i1 = u32_sub i 1 in
-        list_nth_mut_shared_loop_pair_merge_loop t tl0 tl1 i1
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_shared_loop_pair_merge]: forward function
-    Source: 'src/loops.rs', lines 288:0-292:23 *)
-let list_nth_mut_shared_loop_pair_merge
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) : result (t & t) =
-  list_nth_mut_shared_loop_pair_merge_loop t ls0 ls1 i
-
-(** [loops::list_nth_mut_shared_loop_pair_merge]: loop 0: backward function 0
-    Source: 'src/loops.rs', lines 288:0-303:1 *)
-let rec list_nth_mut_shared_loop_pair_merge_loop_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  Tot (result (list_t t))
-  (decreases (list_nth_mut_shared_loop_pair_merge_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons _ tl1 ->
-      if i = 0
-      then Return (List_Cons ret tl0)
-      else
-        let* i1 = u32_sub i 1 in
-        let* tl01 =
-          list_nth_mut_shared_loop_pair_merge_loop_back t tl0 tl1 i1 ret in
-        Return (List_Cons x0 tl01)
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_mut_shared_loop_pair_merge]: backward function 0
-    Source: 'src/loops.rs', lines 288:0-292:23 *)
-let list_nth_mut_shared_loop_pair_merge_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  result (list_t t)
-  =
-  list_nth_mut_shared_loop_pair_merge_loop_back t ls0 ls1 i ret
-
-(** [loops::list_nth_shared_mut_loop_pair]: loop 0: forward function
-    Source: 'src/loops.rs', lines 307:0-322: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))
-  (decreases (list_nth_shared_mut_loop_pair_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (x0, x1)
-      else
-        let* i1 = u32_sub i 1 in
-        list_nth_shared_mut_loop_pair_loop t tl0 tl1 i1
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_shared_mut_loop_pair]: forward function
-    Source: 'src/loops.rs', lines 307:0-311:23 *)
-let list_nth_shared_mut_loop_pair
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) : result (t & t) =
-  list_nth_shared_mut_loop_pair_loop t ls0 ls1 i
-
-(** [loops::list_nth_shared_mut_loop_pair]: loop 0: backward function 1
-    Source: 'src/loops.rs', lines 307:0-322:1 *)
-let rec list_nth_shared_mut_loop_pair_loop_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  Tot (result (list_t t))
-  (decreases (list_nth_shared_mut_loop_pair_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons _ tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (List_Cons ret tl1)
-      else
-        let* i1 = u32_sub i 1 in
-        let* tl11 = list_nth_shared_mut_loop_pair_loop_back t tl0 tl1 i1 ret in
-        Return (List_Cons x1 tl11)
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_shared_mut_loop_pair]: backward function 1
-    Source: 'src/loops.rs', lines 307:0-311:23 *)
-let list_nth_shared_mut_loop_pair_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  result (list_t t)
-  =
-  list_nth_shared_mut_loop_pair_loop_back t ls0 ls1 i ret
-
-(** [loops::list_nth_shared_mut_loop_pair_merge]: loop 0: forward function
-    Source: 'src/loops.rs', lines 326:0-341: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))
-  (decreases (list_nth_shared_mut_loop_pair_merge_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons x0 tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (x0, x1)
-      else
-        let* i1 = u32_sub i 1 in
-        list_nth_shared_mut_loop_pair_merge_loop t tl0 tl1 i1
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_shared_mut_loop_pair_merge]: forward function
-    Source: 'src/loops.rs', lines 326:0-330:23 *)
-let list_nth_shared_mut_loop_pair_merge
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) : result (t & t) =
-  list_nth_shared_mut_loop_pair_merge_loop t ls0 ls1 i
-
-(** [loops::list_nth_shared_mut_loop_pair_merge]: loop 0: backward function 0
-    Source: 'src/loops.rs', lines 326:0-341:1 *)
-let rec list_nth_shared_mut_loop_pair_merge_loop_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  Tot (result (list_t t))
-  (decreases (list_nth_shared_mut_loop_pair_merge_loop_decreases t ls0 ls1 i))
-  =
-  begin match ls0 with
-  | List_Cons _ tl0 ->
-    begin match ls1 with
-    | List_Cons x1 tl1 ->
-      if i = 0
-      then Return (List_Cons ret tl1)
-      else
-        let* i1 = u32_sub i 1 in
-        let* tl11 =
-          list_nth_shared_mut_loop_pair_merge_loop_back t tl0 tl1 i1 ret in
-        Return (List_Cons x1 tl11)
-    | List_Nil -> Fail Failure
-    end
-  | List_Nil -> Fail Failure
-  end
-
-(** [loops::list_nth_shared_mut_loop_pair_merge]: backward function 0
-    Source: 'src/loops.rs', lines 326:0-330:23 *)
-let list_nth_shared_mut_loop_pair_merge_back
-  (t : Type0) (ls0 : list_t t) (ls1 : list_t t) (i : u32) (ret : t) :
-  result (list_t t)
-  =
-  list_nth_shared_mut_loop_pair_merge_loop_back t ls0 ls1 i ret
-
diff --git a/tests/fstar-split/misc/Loops.Types.fst b/tests/fstar-split/misc/Loops.Types.fst
deleted file mode 100644
index 29f56e1b..00000000
--- a/tests/fstar-split/misc/Loops.Types.fst
+++ /dev/null
@@ -1,13 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [loops]: type definitions *)
-module Loops.Types
-open Primitives
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [loops::List]
-    Source: 'src/loops.rs', lines 70:0-70: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-split/misc/Makefile b/tests/fstar-split/misc/Makefile
deleted file mode 100644
index fa7d1f36..00000000
--- a/tests/fstar-split/misc/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-split/misc/NoNestedBorrows.fst b/tests/fstar-split/misc/NoNestedBorrows.fst
deleted file mode 100644
index 53e1d300..00000000
--- a/tests/fstar-split/misc/NoNestedBorrows.fst
+++ /dev/null
@@ -1,618 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [no_nested_borrows] *)
-module NoNestedBorrows
-open Primitives
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [no_nested_borrows::Pair]
-    Source: 'src/no_nested_borrows.rs', lines 4:0-4:23 *)
-type pair_t (t1 t2 : Type0) = { x : t1; y : t2; }
-
-(** [no_nested_borrows::List]
-    Source: 'src/no_nested_borrows.rs', lines 9:0-9: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: 'src/no_nested_borrows.rs', lines 20:0-20:16 *)
-type one_t (t1 : Type0) = | One_One : t1 -> one_t t1
-
-(** [no_nested_borrows::EmptyEnum]
-    Source: 'src/no_nested_borrows.rs', lines 26:0-26:18 *)
-type emptyEnum_t = | EmptyEnum_Empty : emptyEnum_t
-
-(** [no_nested_borrows::Enum]
-    Source: 'src/no_nested_borrows.rs', lines 32:0-32:13 *)
-type enum_t = | Enum_Variant1 : enum_t | Enum_Variant2 : enum_t
-
-(** [no_nested_borrows::EmptyStruct]
-    Source: 'src/no_nested_borrows.rs', lines 39:0-39:22 *)
-type emptyStruct_t = unit
-
-(** [no_nested_borrows::Sum]
-    Source: 'src/no_nested_borrows.rs', lines 41:0-41:20 *)
-type sum_t (t1 t2 : Type0) =
-| Sum_Left : t1 -> sum_t t1 t2
-| Sum_Right : t2 -> sum_t t1 t2
-
-(** [no_nested_borrows::neg_test]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 48:0-48:30 *)
-let neg_test (x : i32) : result i32 =
-  i32_neg x
-
-(** [no_nested_borrows::add_u32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 54:0-54:37 *)
-let add_u32 (x : u32) (y : u32) : result u32 =
-  u32_add x y
-
-(** [no_nested_borrows::subs_u32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 60:0-60:38 *)
-let subs_u32 (x : u32) (y : u32) : result u32 =
-  u32_sub x y
-
-(** [no_nested_borrows::div_u32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 66:0-66:37 *)
-let div_u32 (x : u32) (y : u32) : result u32 =
-  u32_div x y
-
-(** [no_nested_borrows::div_u32_const]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 73:0-73:35 *)
-let div_u32_const (x : u32) : result u32 =
-  u32_div x 2
-
-(** [no_nested_borrows::rem_u32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 78:0-78:37 *)
-let rem_u32 (x : u32) (y : u32) : result u32 =
-  u32_rem x y
-
-(** [no_nested_borrows::mul_u32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 82:0-82:37 *)
-let mul_u32 (x : u32) (y : u32) : result u32 =
-  u32_mul x y
-
-(** [no_nested_borrows::add_i32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 88:0-88:37 *)
-let add_i32 (x : i32) (y : i32) : result i32 =
-  i32_add x y
-
-(** [no_nested_borrows::subs_i32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 92:0-92:38 *)
-let subs_i32 (x : i32) (y : i32) : result i32 =
-  i32_sub x y
-
-(** [no_nested_borrows::div_i32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 96:0-96:37 *)
-let div_i32 (x : i32) (y : i32) : result i32 =
-  i32_div x y
-
-(** [no_nested_borrows::div_i32_const]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 100:0-100:35 *)
-let div_i32_const (x : i32) : result i32 =
-  i32_div x 2
-
-(** [no_nested_borrows::rem_i32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 104:0-104:37 *)
-let rem_i32 (x : i32) (y : i32) : result i32 =
-  i32_rem x y
-
-(** [no_nested_borrows::mul_i32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 108:0-108:37 *)
-let mul_i32 (x : i32) (y : i32) : result i32 =
-  i32_mul x y
-
-(** [no_nested_borrows::mix_arith_u32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 112:0-112:51 *)
-let mix_arith_u32 (x : u32) (y : u32) (z : u32) : result u32 =
-  let* i = u32_add x y in
-  let* i1 = u32_div x y in
-  let* i2 = u32_mul i i1 in
-  let* i3 = u32_rem z y in
-  let* i4 = u32_sub x i3 in
-  let* i5 = u32_add i2 i4 in
-  let* i6 = u32_add x y in
-  let* i7 = u32_add i6 z in
-  u32_rem i5 i7
-
-(** [no_nested_borrows::mix_arith_i32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 116:0-116:51 *)
-let mix_arith_i32 (x : i32) (y : i32) (z : i32) : result i32 =
-  let* i = i32_add x y in
-  let* i1 = i32_div x y in
-  let* i2 = i32_mul i i1 in
-  let* i3 = i32_rem z y in
-  let* i4 = i32_sub x i3 in
-  let* i5 = i32_add i2 i4 in
-  let* i6 = i32_add x y in
-  let* i7 = i32_add i6 z in
-  i32_rem i5 i7
-
-(** [no_nested_borrows::CONST0]
-    Source: 'src/no_nested_borrows.rs', lines 125:0-125:23 *)
-let const0_body : result usize = usize_add 1 1
-let const0_c : usize = eval_global const0_body
-
-(** [no_nested_borrows::CONST1]
-    Source: 'src/no_nested_borrows.rs', lines 126:0-126:23 *)
-let const1_body : result usize = usize_mul 2 2
-let const1_c : usize = eval_global const1_body
-
-(** [no_nested_borrows::cast_u32_to_i32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 128:0-128:37 *)
-let cast_u32_to_i32 (x : u32) : result i32 =
-  scalar_cast U32 I32 x
-
-(** [no_nested_borrows::cast_bool_to_i32]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 132:0-132:39 *)
-let cast_bool_to_i32 (x : bool) : result i32 =
-  scalar_cast_bool I32 x
-
-(** [no_nested_borrows::cast_bool_to_bool]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 137:0-137:41 *)
-let cast_bool_to_bool (x : bool) : result bool =
-  Return x
-
-(** [no_nested_borrows::test2]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 142:0-142:14 *)
-let test2 : result unit =
-  let* _ = u32_add 23 44 in Return ()
-
-(** Unit test for [no_nested_borrows::test2] *)
-let _ = assert_norm (test2 = Return ())
-
-(** [no_nested_borrows::get_max]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 154:0-154:37 *)
-let get_max (x : u32) (y : u32) : result u32 =
-  if x >= y then Return x else Return y
-
-(** [no_nested_borrows::test3]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 162:0-162:14 *)
-let test3 : result unit =
-  let* x = get_max 4 3 in
-  let* y = get_max 10 11 in
-  let* z = u32_add x y in
-  if not (z = 15) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::test3] *)
-let _ = assert_norm (test3 = Return ())
-
-(** [no_nested_borrows::test_neg1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 169:0-169:18 *)
-let test_neg1 : result unit =
-  let* y = i32_neg 3 in if not (y = -3) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::test_neg1] *)
-let _ = assert_norm (test_neg1 = Return ())
-
-(** [no_nested_borrows::refs_test1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 176:0-176:19 *)
-let refs_test1 : result unit =
-  if not (1 = 1) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::refs_test1] *)
-let _ = assert_norm (refs_test1 = Return ())
-
-(** [no_nested_borrows::refs_test2]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 187:0-187:19 *)
-let refs_test2 : result unit =
-  if not (2 = 2)
-  then Fail Failure
-  else
-    if not (0 = 0)
-    then Fail Failure
-    else
-      if not (2 = 2)
-      then Fail Failure
-      else if not (2 = 2) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::refs_test2] *)
-let _ = assert_norm (refs_test2 = Return ())
-
-(** [no_nested_borrows::test_list1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 203:0-203:19 *)
-let test_list1 : result unit =
-  Return ()
-
-(** Unit test for [no_nested_borrows::test_list1] *)
-let _ = assert_norm (test_list1 = Return ())
-
-(** [no_nested_borrows::test_box1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 208:0-208:18 *)
-let test_box1 : result unit =
-  let* b = alloc_boxed_Box_deref_mut_back i32 0 1 in
-  let* x = alloc_boxed_Box_deref i32 b in
-  if not (x = 1) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::test_box1] *)
-let _ = assert_norm (test_box1 = Return ())
-
-(** [no_nested_borrows::copy_int]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 218:0-218:30 *)
-let copy_int (x : i32) : result i32 =
-  Return x
-
-(** [no_nested_borrows::test_unreachable]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 224:0-224:32 *)
-let test_unreachable (b : bool) : result unit =
-  if b then Fail Failure else Return ()
-
-(** [no_nested_borrows::test_panic]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 232:0-232:26 *)
-let test_panic (b : bool) : result unit =
-  if b then Fail Failure else Return ()
-
-(** [no_nested_borrows::test_copy_int]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 239:0-239:22 *)
-let test_copy_int : result unit =
-  let* y = copy_int 0 in if not (0 = y) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::test_copy_int] *)
-let _ = assert_norm (test_copy_int = Return ())
-
-(** [no_nested_borrows::is_cons]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 246:0-246:38 *)
-let is_cons (t : Type0) (l : list_t t) : result bool =
-  begin match l with
-  | List_Cons _ _ -> Return true
-  | List_Nil -> Return false
-  end
-
-(** [no_nested_borrows::test_is_cons]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 253:0-253: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 Return ()
-
-(** Unit test for [no_nested_borrows::test_is_cons] *)
-let _ = assert_norm (test_is_cons = Return ())
-
-(** [no_nested_borrows::split_list]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 259:0-259:48 *)
-let split_list (t : Type0) (l : list_t t) : result (t & (list_t t)) =
-  begin match l with
-  | List_Cons hd tl -> Return (hd, tl)
-  | List_Nil -> Fail Failure
-  end
-
-(** [no_nested_borrows::test_split_list]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 267:0-267:24 *)
-let test_split_list : result unit =
-  let* p = split_list i32 (List_Cons 0 List_Nil) in
-  let (hd, _) = p in
-  if not (hd = 0) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::test_split_list] *)
-let _ = assert_norm (test_split_list = Return ())
-
-(** [no_nested_borrows::choose]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 274:0-274:70 *)
-let choose (t : Type0) (b : bool) (x : t) (y : t) : result t =
-  if b then Return x else Return y
-
-(** [no_nested_borrows::choose]: backward function 0
-    Source: 'src/no_nested_borrows.rs', lines 274:0-274:70 *)
-let choose_back
-  (t : Type0) (b : bool) (x : t) (y : t) (ret : t) : result (t & t) =
-  if b then Return (ret, y) else Return (x, ret)
-
-(** [no_nested_borrows::choose_test]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 282:0-282:20 *)
-let choose_test : result unit =
-  let* z = choose i32 true 0 0 in
-  let* z1 = i32_add z 1 in
-  if not (z1 = 1)
-  then Fail Failure
-  else
-    let* (x, y) = choose_back i32 true 0 0 z1 in
-    if not (x = 1)
-    then Fail Failure
-    else if not (y = 0) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::choose_test] *)
-let _ = assert_norm (choose_test = Return ())
-
-(** [no_nested_borrows::test_char]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 294:0-294:26 *)
-let test_char : result char =
-  Return 'a'
-
-(** [no_nested_borrows::Tree]
-    Source: 'src/no_nested_borrows.rs', lines 299:0-299: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: 'src/no_nested_borrows.rs', lines 304:0-304: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]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 339:0-339: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
-  | List_Nil -> Return 0
-  end
-
-(** [no_nested_borrows::list_nth_shared]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 347:0-347:62 *)
-let rec list_nth_shared (t : Type0) (l : list_t t) (i : u32) : result t =
-  begin match l with
-  | List_Cons x tl ->
-    if i = 0
-    then Return x
-    else let* i1 = u32_sub i 1 in list_nth_shared t tl i1
-  | List_Nil -> Fail Failure
-  end
-
-(** [no_nested_borrows::list_nth_mut]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 363:0-363:67 *)
-let rec list_nth_mut (t : Type0) (l : list_t t) (i : u32) : result t =
-  begin match l with
-  | List_Cons x tl ->
-    if i = 0 then Return x else let* i1 = u32_sub i 1 in list_nth_mut t tl i1
-  | List_Nil -> Fail Failure
-  end
-
-(** [no_nested_borrows::list_nth_mut]: backward function 0
-    Source: 'src/no_nested_borrows.rs', lines 363:0-363:67 *)
-let rec list_nth_mut_back
-  (t : Type0) (l : list_t t) (i : u32) (ret : t) : result (list_t t) =
-  begin match l with
-  | List_Cons x tl ->
-    if i = 0
-    then Return (List_Cons ret tl)
-    else
-      let* i1 = u32_sub i 1 in
-      let* tl1 = list_nth_mut_back t tl i1 ret in
-      Return (List_Cons x tl1)
-  | List_Nil -> Fail Failure
-  end
-
-(** [no_nested_borrows::list_rev_aux]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 379:0-379:63 *)
-let rec list_rev_aux
-  (t : Type0) (li : list_t t) (lo : list_t t) : result (list_t t) =
-  begin match li with
-  | List_Cons hd tl -> list_rev_aux t tl (List_Cons hd lo)
-  | List_Nil -> Return lo
-  end
-
-(** [no_nested_borrows::list_rev]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ())
-    Source: 'src/no_nested_borrows.rs', lines 393:0-393: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]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 398:0-398:28 *)
-let test_list_functions : result unit =
-  let l = List_Cons 2 List_Nil in
-  let l1 = List_Cons 1 l in
-  let* i = list_length i32 (List_Cons 0 l1) in
-  if not (i = 3)
-  then Fail Failure
-  else
-    let* i1 = list_nth_shared i32 (List_Cons 0 l1) 0 in
-    if not (i1 = 0)
-    then Fail Failure
-    else
-      let* i2 = list_nth_shared i32 (List_Cons 0 l1) 1 in
-      if not (i2 = 1)
-      then Fail Failure
-      else
-        let* i3 = list_nth_shared i32 (List_Cons 0 l1) 2 in
-        if not (i3 = 2)
-        then Fail Failure
-        else
-          let* ls = list_nth_mut_back i32 (List_Cons 0 l1) 1 3 in
-          let* i4 = list_nth_shared i32 ls 0 in
-          if not (i4 = 0)
-          then Fail Failure
-          else
-            let* i5 = list_nth_shared i32 ls 1 in
-            if not (i5 = 3)
-            then Fail Failure
-            else
-              let* i6 = list_nth_shared i32 ls 2 in
-              if not (i6 = 2) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::test_list_functions] *)
-let _ = assert_norm (test_list_functions = Return ())
-
-(** [no_nested_borrows::id_mut_pair1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 414:0-414:89 *)
-let id_mut_pair1 (t1 t2 : Type0) (x : t1) (y : t2) : result (t1 & t2) =
-  Return (x, y)
-
-(** [no_nested_borrows::id_mut_pair1]: backward function 0
-    Source: 'src/no_nested_borrows.rs', lines 414:0-414:89 *)
-let id_mut_pair1_back
-  (t1 t2 : Type0) (x : t1) (y : t2) (ret : (t1 & t2)) : result (t1 & t2) =
-  let (x1, x2) = ret in Return (x1, x2)
-
-(** [no_nested_borrows::id_mut_pair2]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 418:0-418:88 *)
-let id_mut_pair2 (t1 t2 : Type0) (p : (t1 & t2)) : result (t1 & t2) =
-  let (x, x1) = p in Return (x, x1)
-
-(** [no_nested_borrows::id_mut_pair2]: backward function 0
-    Source: 'src/no_nested_borrows.rs', lines 418:0-418:88 *)
-let id_mut_pair2_back
-  (t1 t2 : Type0) (p : (t1 & t2)) (ret : (t1 & t2)) : result (t1 & t2) =
-  let (x, x1) = ret in Return (x, x1)
-
-(** [no_nested_borrows::id_mut_pair3]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 422:0-422:93 *)
-let id_mut_pair3 (t1 t2 : Type0) (x : t1) (y : t2) : result (t1 & t2) =
-  Return (x, y)
-
-(** [no_nested_borrows::id_mut_pair3]: backward function 0
-    Source: 'src/no_nested_borrows.rs', lines 422:0-422:93 *)
-let id_mut_pair3_back'a
-  (t1 t2 : Type0) (x : t1) (y : t2) (ret : t1) : result t1 =
-  Return ret
-
-(** [no_nested_borrows::id_mut_pair3]: backward function 1
-    Source: 'src/no_nested_borrows.rs', lines 422:0-422:93 *)
-let id_mut_pair3_back'b
-  (t1 t2 : Type0) (x : t1) (y : t2) (ret : t2) : result t2 =
-  Return ret
-
-(** [no_nested_borrows::id_mut_pair4]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 426:0-426:92 *)
-let id_mut_pair4 (t1 t2 : Type0) (p : (t1 & t2)) : result (t1 & t2) =
-  let (x, x1) = p in Return (x, x1)
-
-(** [no_nested_borrows::id_mut_pair4]: backward function 0
-    Source: 'src/no_nested_borrows.rs', lines 426:0-426:92 *)
-let id_mut_pair4_back'a
-  (t1 t2 : Type0) (p : (t1 & t2)) (ret : t1) : result t1 =
-  Return ret
-
-(** [no_nested_borrows::id_mut_pair4]: backward function 1
-    Source: 'src/no_nested_borrows.rs', lines 426:0-426:92 *)
-let id_mut_pair4_back'b
-  (t1 t2 : Type0) (p : (t1 & t2)) (ret : t2) : result t2 =
-  Return ret
-
-(** [no_nested_borrows::StructWithTuple]
-    Source: 'src/no_nested_borrows.rs', lines 433:0-433:34 *)
-type structWithTuple_t (t1 t2 : Type0) = { p : (t1 & t2); }
-
-(** [no_nested_borrows::new_tuple1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 437:0-437:48 *)
-let new_tuple1 : result (structWithTuple_t u32 u32) =
-  Return { p = (1, 2) }
-
-(** [no_nested_borrows::new_tuple2]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 441:0-441:48 *)
-let new_tuple2 : result (structWithTuple_t i16 i16) =
-  Return { p = (1, 2) }
-
-(** [no_nested_borrows::new_tuple3]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 445:0-445:48 *)
-let new_tuple3 : result (structWithTuple_t u64 i64) =
-  Return { p = (1, 2) }
-
-(** [no_nested_borrows::StructWithPair]
-    Source: 'src/no_nested_borrows.rs', lines 450:0-450:33 *)
-type structWithPair_t (t1 t2 : Type0) = { p : pair_t t1 t2; }
-
-(** [no_nested_borrows::new_pair1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 454:0-454:46 *)
-let new_pair1 : result (structWithPair_t u32 u32) =
-  Return { p = { x = 1; y = 2 } }
-
-(** [no_nested_borrows::test_constants]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 462:0-462:23 *)
-let test_constants : result unit =
-  let* swt = new_tuple1 in
-  let (i, _) = swt.p in
-  if not (i = 1)
-  then Fail Failure
-  else
-    let* swt1 = new_tuple2 in
-    let (i1, _) = swt1.p in
-    if not (i1 = 1)
-    then Fail Failure
-    else
-      let* swt2 = new_tuple3 in
-      let (i2, _) = swt2.p in
-      if not (i2 = 1)
-      then Fail Failure
-      else
-        let* swp = new_pair1 in
-        if not (swp.p.x = 1) then Fail Failure else Return ()
-
-(** Unit test for [no_nested_borrows::test_constants] *)
-let _ = assert_norm (test_constants = Return ())
-
-(** [no_nested_borrows::test_weird_borrows1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 471:0-471:28 *)
-let test_weird_borrows1 : result unit =
-  Return ()
-
-(** Unit test for [no_nested_borrows::test_weird_borrows1] *)
-let _ = assert_norm (test_weird_borrows1 = Return ())
-
-(** [no_nested_borrows::test_mem_replace]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ())
-    Source: 'src/no_nested_borrows.rs', lines 481:0-481: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 Return 2
-
-(** [no_nested_borrows::test_shared_borrow_bool1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 488:0-488:47 *)
-let test_shared_borrow_bool1 (b : bool) : result u32 =
-  if b then Return 0 else Return 1
-
-(** [no_nested_borrows::test_shared_borrow_bool2]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 501:0-501:40 *)
-let test_shared_borrow_bool2 : result u32 =
-  Return 0
-
-(** [no_nested_borrows::test_shared_borrow_enum1]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 516:0-516:52 *)
-let test_shared_borrow_enum1 (l : list_t u32) : result u32 =
-  begin match l with | List_Cons _ _ -> Return 1 | List_Nil -> Return 0 end
-
-(** [no_nested_borrows::test_shared_borrow_enum2]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 528:0-528:40 *)
-let test_shared_borrow_enum2 : result u32 =
-  Return 0
-
-(** [no_nested_borrows::incr]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ())
-    Source: 'src/no_nested_borrows.rs', lines 539:0-539:24 *)
-let incr (x : u32) : result u32 =
-  u32_add x 1
-
-(** [no_nested_borrows::call_incr]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 543:0-543:35 *)
-let call_incr (x : u32) : result u32 =
-  incr x
-
-(** [no_nested_borrows::read_then_incr]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 548:0-548:41 *)
-let read_then_incr (x : u32) : result u32 =
-  let* _ = u32_add x 1 in Return x
-
-(** [no_nested_borrows::read_then_incr]: backward function 0
-    Source: 'src/no_nested_borrows.rs', lines 548:0-548:41 *)
-let read_then_incr_back (x : u32) : result u32 =
-  u32_add x 1
-
-(** [no_nested_borrows::Tuple]
-    Source: 'src/no_nested_borrows.rs', lines 554:0-554:24 *)
-type tuple_t (t1 t2 : Type0) = t1 * t2
-
-(** [no_nested_borrows::use_tuple_struct]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ())
-    Source: 'src/no_nested_borrows.rs', lines 556:0-556:48 *)
-let use_tuple_struct (x : tuple_t u32 u32) : result (tuple_t u32 u32) =
-  let (_, i) = x in Return (1, i)
-
-(** [no_nested_borrows::create_tuple_struct]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 560:0-560:61 *)
-let create_tuple_struct (x : u32) (y : u64) : result (tuple_t u32 u64) =
-  Return (x, y)
-
-(** [no_nested_borrows::IdType]
-    Source: 'src/no_nested_borrows.rs', lines 565:0-565:20 *)
-type idType_t (t : Type0) = t
-
-(** [no_nested_borrows::use_id_type]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 567:0-567:40 *)
-let use_id_type (t : Type0) (x : idType_t t) : result t =
-  Return x
-
-(** [no_nested_borrows::create_id_type]: forward function
-    Source: 'src/no_nested_borrows.rs', lines 571:0-571:43 *)
-let create_id_type (t : Type0) (x : t) : result (idType_t t) =
-  Return x
-
diff --git a/tests/fstar-split/misc/Paper.fst b/tests/fstar-split/misc/Paper.fst
deleted file mode 100644
index 0c44d78b..00000000
--- a/tests/fstar-split/misc/Paper.fst
+++ /dev/null
@@ -1,109 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [paper] *)
-module Paper
-open Primitives
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [paper::ref_incr]: merged forward/backward function
-    (there is a single backward function, and the forward function returns ())
-    Source: 'src/paper.rs', lines 4:0-4:28 *)
-let ref_incr (x : i32) : result i32 =
-  i32_add x 1
-
-(** [paper::test_incr]: forward function
-    Source: 'src/paper.rs', lines 8:0-8:18 *)
-let test_incr : result unit =
-  let* x = ref_incr 0 in if not (x = 1) then Fail Failure else Return ()
-
-(** Unit test for [paper::test_incr] *)
-let _ = assert_norm (test_incr = Return ())
-
-(** [paper::choose]: forward function
-    Source: 'src/paper.rs', lines 15:0-15:70 *)
-let choose (t : Type0) (b : bool) (x : t) (y : t) : result t =
-  if b then Return x else Return y
-
-(** [paper::choose]: backward function 0
-    Source: 'src/paper.rs', lines 15:0-15:70 *)
-let choose_back
-  (t : Type0) (b : bool) (x : t) (y : t) (ret : t) : result (t & t) =
-  if b then Return (ret, y) else Return (x, ret)
-
-(** [paper::test_choose]: forward function
-    Source: 'src/paper.rs', lines 23:0-23:20 *)
-let test_choose : result unit =
-  let* z = choose i32 true 0 0 in
-  let* z1 = i32_add z 1 in
-  if not (z1 = 1)
-  then Fail Failure
-  else
-    let* (x, y) = choose_back i32 true 0 0 z1 in
-    if not (x = 1)
-    then Fail Failure
-    else if not (y = 0) then Fail Failure else Return ()
-
-(** Unit test for [paper::test_choose] *)
-let _ = assert_norm (test_choose = Return ())
-
-(** [paper::List]
-    Source: 'src/paper.rs', lines 35:0-35:16 *)
-type list_t (t : Type0) =
-| List_Cons : t -> list_t t -> list_t t
-| List_Nil : list_t t
-
-(** [paper::list_nth_mut]: forward function
-    Source: 'src/paper.rs', lines 42:0-42:67 *)
-let rec list_nth_mut (t : Type0) (l : list_t t) (i : u32) : result t =
-  begin match l with
-  | List_Cons x tl ->
-    if i = 0 then Return x else let* i1 = u32_sub i 1 in list_nth_mut t tl i1
-  | List_Nil -> Fail Failure
-  end
-
-(** [paper::list_nth_mut]: backward function 0
-    Source: 'src/paper.rs', lines 42:0-42:67 *)
-let rec list_nth_mut_back
-  (t : Type0) (l : list_t t) (i : u32) (ret : t) : result (list_t t) =
-  begin match l with
-  | List_Cons x tl ->
-    if i = 0
-    then Return (List_Cons ret tl)
-    else
-      let* i1 = u32_sub i 1 in
-      let* tl1 = list_nth_mut_back t tl i1 ret in
-      Return (List_Cons x tl1)
-  | List_Nil -> Fail Failure
-  end
-
-(** [paper::sum]: forward function
-    Source: 'src/paper.rs', lines 57:0-57: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
-  | List_Nil -> Return 0
-  end
-
-(** [paper::test_nth]: forward function
-    Source: 'src/paper.rs', lines 68:0-68:17 *)
-let test_nth : result unit =
-  let l = List_Cons 3 List_Nil in
-  let l1 = List_Cons 2 l in
-  let* x = list_nth_mut i32 (List_Cons 1 l1) 2 in
-  let* x1 = i32_add x 1 in
-  let* l2 = list_nth_mut_back i32 (List_Cons 1 l1) 2 x1 in
-  let* i = sum l2 in
-  if not (i = 7) then Fail Failure else Return ()
-
-(** Unit test for [paper::test_nth] *)
-let _ = assert_norm (test_nth = Return ())
-
-(** [paper::call_choose]: forward function
-    Source: 'src/paper.rs', lines 76:0-76:44 *)
-let call_choose (p : (u32 & u32)) : result u32 =
-  let (px, py) = p in
-  let* pz = choose u32 true px py in
-  let* pz1 = u32_add pz 1 in
-  let* (px1, _) = choose_back u32 true px py pz1 in
-  Return px1
-
diff --git a/tests/fstar-split/misc/PoloniusList.fst b/tests/fstar-split/misc/PoloniusList.fst
deleted file mode 100644
index 8a8b7ae3..00000000
--- a/tests/fstar-split/misc/PoloniusList.fst
+++ /dev/null
@@ -1,34 +0,0 @@
-(** THIS FILE WAS AUTOMATICALLY GENERATED BY AENEAS *)
-(** [polonius_list] *)
-module PoloniusList
-open Primitives
-
-#set-options "--z3rlimit 50 --fuel 1 --ifuel 1"
-
-(** [polonius_list::List]
-    Source: 'src/polonius_list.rs', lines 3:0-3: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]: forward function
-    Source: 'src/polonius_list.rs', lines 13:0-13:76 *)
-let rec get_list_at_x (ls : list_t u32) (x : u32) : result (list_t u32) =
-  begin match ls with
-  | List_Cons hd tl ->
-    if hd = x then Return (List_Cons hd tl) else get_list_at_x tl x
-  | List_Nil -> Return List_Nil
-  end
-
-(** [polonius_list::get_list_at_x]: backward function 0
-    Source: 'src/polonius_list.rs', lines 13:0-13:76 *)
-let rec get_list_at_x_back
-  (ls : list_t u32) (x : u32) (ret : list_t u32) : result (list_t u32) =
-  begin match ls with
-  | List_Cons hd tl ->
-    if hd = x
-    then Return ret
-    else let* tl1 = get_list_at_x_back tl x ret in Return (List_Cons hd tl1)
-  | List_Nil -> Return ret
-  end
-
diff --git a/tests/fstar-split/misc/Primitives.fst b/tests/fstar-split/misc/Primitives.fst
deleted file mode 100644
index a3ffbde4..00000000
--- a/tests/fstar-split/misc/Primitives.fst
+++ /dev/null
@@ -1,884 +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 =
-| Return : v:a -> result a
-| Fail : e:error -> result a
-
-// Monadic return operator
-unfold let return (#a : Type0) (x : a) : result a = Return 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 == Return x)) (ensures fun _ -> True)) :
-  result b =
-  match m with
-  | Return x -> f x
-  | Fail e   -> Fail e
-
-// Monadic assert(...)
-let massert (b:bool) : result unit = if b then Return () else Fail Failure
-
-// Normalize and unwrap a successful result (used for globals).
-let eval_global (#a : Type0) (x : result a{Return? (normalize_term x)}) : a = Return?.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 = x
-let core_mem_replace_back (a : Type0) (x : a) (y : a) : a = y
-
-// 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 Return 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::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;
-  index_mut_back : self → idx → 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;
-  deref_mut_back : self → 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 = Return x
-let alloc_boxed_Box_deref_mut (t : Type0) (x : t) : result t = Return x
-let alloc_boxed_Box_deref_mut_back (t : Type) (_ : t) (x : t) : result t = Return 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;
-  deref_mut_back = alloc_boxed_Box_deref_mut_back 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 Return (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 Return (list_update x i nx)
-  else Fail Failure
-
-(*** 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 Return (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 Return (list_update x i nx)
-  else Fail Failure
-
-(*** Subslices *)
-
-let array_to_slice (a : Type0) (n : usize) (x : array a n) : result (slice a) = Return 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 Return s
-  else Fail Failure
-
-// 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 Return (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 Return (list_update v i x) else Fail Failure
-
-// The **forward** function shouldn't be used
-let alloc_vec_Vec_push_fwd (a  : Type0) (v : alloc_vec_Vec a) (x : a) : unit = ()
-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
-    | Return 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);
-    Return (append v [x])
-    end
-  else Fail Failure
-
-// The **forward** function shouldn't be used
-let alloc_vec_Vec_insert_fwd (a : Type0) (v : alloc_vec_Vec a) (i : usize) (x : a) : result unit =
-  if i < length v then Return () 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 Return (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);
-  get_mut_back : self → t → 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;
-  index_mut_back : self → t → 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 -> Return 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)) =
-  admit () // TODO
-
-// [core::slice::index::Range::get_mut]: backward function 0
-let core_slice_index_RangeUsize_get_mut_back
-  (t : Type0) :
-  core_ops_range_Range usize → 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) =
-  admit () // TODO
-
-// [core::slice::index::Range::index_mut]: backward function 0
-let core_slice_index_RangeUsize_index_mut_back
-  (t : Type0) : core_ops_range_Range usize → 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 =
-  admit () // 
-
-// [core::slice::index::[T]::index_mut]: backward function 0
-let core_slice_index_Slice_index_mut_back
-  (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t)) :
-  slice t → idx → inst.output → result (slice t) =
-  admit () // TODO
-
-// [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 =
-  admit () // TODO
-
-// [core::array::[T; N]::index_mut]: backward function 0
-let core_array_Array_index_mut_back
-  (t idx : Type0) (n : usize) (inst : core_ops_index_IndexMut (slice t) idx)
-  (a : array t n) (i : idx) (x : 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_mut_back = core_slice_index_RangeUsize_get_mut_back 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;
-  index_mut_back = core_slice_index_RangeUsize_index_mut_back 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;
-  index_mut_back = core_slice_index_Slice_index_mut_back 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;
-  index_mut_back = core_array_Array_index_mut_back 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) =
-  admit () // TODO
-
-// [core::slice::index::usize::get_mut]: backward function 0
-let core_slice_index_usize_get_mut_back
-  (t : Type0) : usize → slice 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 =
-  admit () // TODO
-
-// [core::slice::index::usize::index_mut]: backward function 0
-let core_slice_index_usize_index_mut_back
-  (t : Type0) : usize → slice 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_mut_back = core_slice_index_usize_get_mut_back 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;
-  index_mut_back = core_slice_index_usize_index_mut_back 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 =
-  admit () // TODO
-
-// [alloc::vec::Vec::index_mut]: backward function 0
-let alloc_vec_Vec_index_mut_back
-  (t idx : Type0) (inst : core_slice_index_SliceIndex idx (slice t))
-  (self : alloc_vec_Vec t) (i : idx) (x : 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;
-  index_mut_back = alloc_vec_Vec_index_mut_back 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_usize v i)
-  [SMTPat (alloc_vec_Vec_index_mut a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i)]
-  =
-  admit()
-
-let alloc_vec_Vec_index_mut_back_eq (#a : Type0) (v : alloc_vec_Vec a) (i : usize) (x : a) :
-  Lemma (
-    alloc_vec_Vec_index_mut_back a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i x ==
-      alloc_vec_Vec_update_usize v i x)
-  [SMTPat (alloc_vec_Vec_index_mut_back a usize (core_slice_index_SliceIndexUsizeSliceTInst a) v i x)]
-  =
-  admit()